archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

This is patch [#17773] seq plugin crash -> use not converted to float with ibuf1 & ibuf2

Browse Source 
Submitted by Rob Hausauer (paprmh) 

See the link for details:
https://projects.blender.org/tracker/index.php?func=detail&aid=17773&group_id=9&atid=127

Kent
This commit is contained in:
Kent Mein
2008-10-09 04:11:33 +00:00
parent 2e9d07b33b
commit 4bd7fa9e2e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/src/sequence.c
View File

@@ -803,13 +803,19 @@ static void do_effect(int cfra, Sequence *seq, TStripElem * se)
if (!se2->ibuf->rect_float && se->ibuf->rect_float) {
IMB_float_from_rect(se2->ibuf);
}
if (!se3->ibuf->rect_float && se->ibuf->rect_float) {
IMB_float_from_rect(se3->ibuf);
}
if (!se1->ibuf->rect && !se->ibuf->rect_float) {
IMB_rect_from_float(se1->ibuf);
}
if (!se2->ibuf->rect && !se->ibuf->rect_float) {
IMB_rect_from_float(se2->ibuf);
}
if (!se3->ibuf->rect && !se->ibuf->rect_float) {
IMB_rect_from_float(se3->ibuf);
}
sh.execute(seq, cfra, fac, facf, x, y, se1->ibuf, se2->ibuf, se3->ibuf,
se->ibuf);
@@ -1731,9 +1737,10 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
}
if(se->ibuf == 0) {
/* if one of two first inputs are rectfloat, output is float too */
/* if any inputs are rectfloat, output is float too */
if((se->se1 && se->se1->ibuf && se->se1->ibuf->rect_float) ||
(se->se2 && se->se2->ibuf && se->se2->ibuf->rect_float))
(se->se2 && se->se2->ibuf && se->se2->ibuf->rect_float) ||
(se->se3 && se->se3->ibuf && se->se3->ibuf->rect_float))
se->ibuf= IMB_allocImBuf((short)seqrectx, (short)seqrecty, 32, IB_rectfloat, 0);
else
se->ibuf= IMB_allocImBuf((short)seqrectx, (short)seqrecty, 32, IB_rect, 0);