[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16989] trunk/blender/source/blender/src/ sequence.c: This is patch [#17773] seq plugin crash -> use not converted to float with ibuf1 & ibuf2

[Kent Mein]

Revision: 16989
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16989
Author:   sirdude
Date:     2008-10-09 06:11:33 +0200 (Thu, 09 Oct 2008)

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

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

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c 2008-10-09 01:15:54 UTC (rev 
16988)
+++ trunk/blender/source/blender/src/sequence.c 2008-10-09 04:11:33 UTC (rev 
16989)
@@ -803,13 +803,19 @@
        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 @@
                }
 
                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);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs