diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 01:54:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 01:54:17 +0400 |
| commit | 15fc16a49b7e11a45332851ba3357f7b04bc5439 (patch) | |
| tree | 16d222b65bd90bc219d556de8e6bef4d85d1130a /source/blender/blenkernel/intern/sequencer.c | |
| parent | 0994e7f96fd7b98ba3967ca44b93b93fa1c31920 (diff) | |
fix for missing NULL check before calling BKE_sequencer_imbuf_to_sequencer_space().
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index a88818dedcd..1a8aa13d861 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2678,12 +2678,14 @@ static ImBuf *do_render_strip_uncached(SeqRenderData context, Sequence *seq, flo seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN, seq_rendersize_to_proxysize(context.preview_render_size)); - BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE); - - /* we don't need both (speed reasons)! */ - if (ibuf && ibuf->rect_float && ibuf->rect) - imb_freerectImBuf(ibuf); if (ibuf) { + BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE); + + /* we don't need both (speed reasons)! */ + if (ibuf->rect_float && ibuf->rect) { + imb_freerectImBuf(ibuf); + } + seq->strip->stripdata->orig_width = ibuf->x; seq->strip->stripdata->orig_height = ibuf->y; } |