diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-24 18:48:24 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-24 18:48:24 +0400 |
| commit | b4ccf4562cd423290e40674c87afedfd7e967262 (patch) | |
| tree | 5fcac6280d245ad7daafe6823ab77fbfe827d5f9 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 0c288b25c74ed871b607437517e110e6a6957790 (diff) | |
Fix crash on sequencer when movie clip fails to load frame
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8d7ca94ed48..216ac0875c7 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2583,17 +2583,19 @@ static ImBuf *do_render_strip_uncached(SeqRenderData context, Sequence *seq, flo case SEQ_TYPE_MOVIECLIP: { ibuf = seq_render_movieclip_strip(context, seq, nr); - sequencer_imbuf_assign_spaces(context.scene, ibuf); - if (ibuf && use_preprocess) { - ImBuf *i = IMB_dupImBuf(ibuf); + if (ibuf) { + if (use_preprocess) { + ImBuf *i = IMB_dupImBuf(ibuf); + + IMB_freeImBuf(ibuf); - IMB_freeImBuf(ibuf); + ibuf = i; + } - ibuf = i; + copy_to_ibuf_still(context, seq, nr, ibuf); } - copy_to_ibuf_still(context, seq, nr, ibuf); break; } |