diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 15:02:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 15:02:35 +0400 |
| commit | 1022151d6ef644280074c29fd88c42007e17d45b (patch) | |
| tree | 79be974b46f8632d5c0782e9c73710ead192f451 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 03044290cea2f3e38ee8a4d7249ecd48f475ce23 (diff) | |
fix for missing NULL check in BKE_sequence_init_colorspace().
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index a5c1c990b9e..465b1bc4e29 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -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); + } } } } |