[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26778] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: revert previous commit, this should fix without disabling cases that worked before.

[Campbell Barton]

Revision: 26778
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26778
Author:   campbellbarton
Date:     2010-02-10 19:05:52 +0100 (Wed, 10 Feb 2010)

Log Message:
-----------
revert previous commit, this should fix without disabling cases that worked before.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-02-10 17:38:58 UTC (rev 26777)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-02-10 18:05:52 UTC (rev 26778)
@@ -2501,16 +2501,15 @@
 
 		int early_out = sh.early_out(seq, facf, facf);
 
-		/* if any of these are the case blender would crash */
-		if(se1->ibuf==NULL || se1->ibuf_comp==NULL || se2->ibuf==NULL || se2->ibuf_comp==NULL)
-			continue;
-
 		switch (early_out) {
 		case 0: {
 			int x= se2->ibuf->x;
 			int y= se2->ibuf->y;
 			int swap_input = FALSE;
 
+			if(se1->ibuf_comp == NULL)
+				continue;
+
 			if (se1->ibuf_comp->rect_float ||
 			    se2->ibuf->rect_float) {
 				se2->ibuf_comp = IMB_allocImBuf(
@@ -2573,7 +2572,8 @@
 		}
 		case 1: {
 			se2->ibuf_comp = se1->ibuf;
-			IMB_refImBuf(se2->ibuf_comp);
+			if(se2->ibuf_comp)
+				IMB_refImBuf(se2->ibuf_comp);
 
 			break;
 		}