fix for missing NULL check in BKE_sequence_init_colorspace().
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jan 2013 11:02:35 +0000 (11:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jan 2013 11:02:35 +0000 (11:02 +0000)
source/blender/blenkernel/intern/sequencer.c

index a5c1c990b9e7783ab16fa971a66ed484caf90ef7..465b1bc4e2910d06bffbab712270c1aaa44b105a 100644 (file)
@@ -3967,13 +3967,13 @@ void BKE_sequence_init_colorspace(Sequence *seq)
                        /* 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);
+                       }
                }
        }
 }