[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13091] trunk/blender/source/blender/src/ sequence.c: == Sequencer ==

[Peter Schlaile]

Revision: 13091
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13091
Author:   schlaile
Date:     2008-01-01 19:38:41 +0100 (Tue, 01 Jan 2008)

Log Message:
-----------
== Sequencer ==

Added some additional NULL-checks. (se->ibuf can be null, shame on me :)

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-01-01 18:29:19 UTC (rev 13090)
+++ trunk/blender/source/blender/src/sequence.c	2008-01-01 18:38:41 UTC (rev 13091)
@@ -1465,8 +1465,10 @@
 	
 	if(count == 1) {
 		se = do_build_seq_recursively(seq_arr[0], cfra);
-		se->ibuf_comp = se->ibuf;
-		IMB_refImBuf(se->ibuf_comp);
+		if (se->ibuf) {
+			se->ibuf_comp = se->ibuf;
+			IMB_refImBuf(se->ibuf_comp);
+		}
 		return se;
 	}
 
@@ -1485,8 +1487,14 @@
 		}
 		if (seq->blend_mode == SEQ_BLEND_REPLACE) {
 			do_build_seq_recursively(seq, cfra);
-			se->ibuf_comp = se->ibuf;
-			IMB_refImBuf(se->ibuf);
+			if (se->ibuf) {
+				se->ibuf_comp = se->ibuf;
+				IMB_refImBuf(se->ibuf);
+			} else {
+				se->ibuf_comp = IMB_allocImBuf(
+					(short)seqrectx, (short)seqrecty, 
+					32, IB_rect, 0);
+			}
 			break;
 		}
 
@@ -1509,8 +1517,14 @@
 		case -1:
 		case 2:
 			do_build_seq_recursively(seq, cfra);
-			se->ibuf_comp = se->ibuf;
-			IMB_refImBuf(se->ibuf_comp);
+			if (se->ibuf) {
+				se->ibuf_comp = se->ibuf;
+				IMB_refImBuf(se->ibuf_comp);
+			} else {
+				se->ibuf_comp = IMB_allocImBuf(
+					(short)seqrectx, (short)seqrecty, 
+					32, IB_rect, 0);
+			}
 			break;
 		case 1:
 			if (i == 0) {
@@ -1524,6 +1538,11 @@
 			break;
 		case 0:
 			do_build_seq_recursively(seq, cfra);
+			if (!se->ibuf) {
+				se->ibuf = IMB_allocImBuf(
+					(short)seqrectx, (short)seqrecty, 
+					32, IB_rect, 0);
+			}
 			break;
 		}