Commit: 8f51baff85c27ab0fb967e0505495338a51602ee Author: Antony Riakiotakis Date: Wed Feb 4 16:16:11 2015 +0100 Branches: gooseberry https://developer.blender.org/rB8f51baff85c27ab0fb967e0505495338a51602ee
Possibly dangerous feature - don't scale images if they come from a proxy. =================================================================== M source/blender/blenkernel/intern/sequencer.c =================================================================== diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index ab6883f..c3dd17d 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2159,12 +2159,15 @@ static ImBuf *input_preprocess(const SeqRenderData *context, Sequence *seq, floa multibuf(ibuf, mul); } - if (ibuf->x != context->rectx || ibuf->y != context->recty) { - if (scene->r.mode & R_OSA) { - IMB_scaleImBuf(ibuf, (short)context->rectx, (short)context->recty); - } - else { - IMB_scalefastImBuf(ibuf, (short)context->rectx, (short)context->recty); + /* do not scale proxies (happy crash galore here we come!)*/ + if (!is_proxy_image) { + if (ibuf->x != context->rectx || ibuf->y != context->recty) { + if (scene->r.mode & R_OSA) { + IMB_scaleImBuf(ibuf, (short)context->rectx, (short)context->recty); + } + else { + IMB_scalefastImBuf(ibuf, (short)context->rectx, (short)context->recty); + } } } @@ -2980,8 +2983,7 @@ static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, floa if (use_preprocess) ibuf = input_preprocess(context, seq, cfra, ibuf, is_proxy_image, is_preprocessed); - if (G.debug_value != 314) - BKE_sequencer_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf); + BKE_sequencer_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf); return ibuf; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs