Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for missing NULL check in BKE_sequence_init_colorspace().

Browse Source
This commit is contained in:
Campbell Barton
2013-01-04 11:02:35 +00:00
parent 03044290ce
commit 1022151d6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/sequencer.c
View File

@@ -3967,16 +3967,16 @@ void BKE_sequence_init_colorspace(Sequence *seq)
/* byte images are default to straight alpha, however sequencer /* byte images are default to straight alpha, however sequencer
* works in premul space, so mark strip to be premultiplied first * 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; seq->alpha_mode = SEQ_ALPHA_PREMUL;
if (ibuf) {
if (ibuf) if (ibuf->rect_float) {
seq->alpha_mode = SEQ_ALPHA_PREMUL;
}
IMB_freeImBuf(ibuf); IMB_freeImBuf(ibuf);
} }
} }
} }
}
/* NOTE: this function doesn't fill in image names */ /* NOTE: this function doesn't fill in image names */
Sequence *BKE_sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo *seq_load) Sequence *BKE_sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo *seq_load)