[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53555] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: fix for missing NULL check in BKE_sequence_init_colorspace().

[Campbell Barton]

Revision: 53555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53555
Author:   campbellbarton
Date:     2013-01-04 11:02:35 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
fix for missing NULL check in BKE_sequence_init_colorspace().

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	2013-01-04 09:35:38 UTC (rev 53554)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-01-04 11:02:35 UTC (rev 53555)
@@ -3967,13 +3967,13 @@
 			/* byte images are default to straight alpha, however sequencer
 			 * works in premul space, so mark strip to be premultiplied first
 			 */
-			if (!ibuf->rect_float)
-				seq->alpha_mode = SEQ_ALPHA_STRAIGHT;
-			else
-				seq->alpha_mode = SEQ_ALPHA_PREMUL;
-
-			if (ibuf)
+			seq->alpha_mode = SEQ_ALPHA_PREMUL;
+			if (ibuf) {
+				if (ibuf->rect_float) {
+					seq->alpha_mode = SEQ_ALPHA_PREMUL;
+				}
 				IMB_freeImBuf(ibuf);
+			}
 		}
 	}
 }