From aa003c73245f6727a472f843e0216b7f92ae0c64 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Thu, 6 Jun 2019 15:23:53 -0700 Subject: FIX: `use_proxy` strip property state has no effect. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: Olly Funkster, Richard Antalík Reviewed By: brecht Differential Revision: https://developer.blender.org/D2504 --- source/blender/blenkernel/intern/sequencer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 095e7e88193..ac242e35b03 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3137,9 +3137,16 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, { ImBuf *ibuf = NULL; StripAnim *sanim; + bool is_multiview = (seq->flag & SEQ_USE_VIEWS) != 0 && (context->scene->r.scemode & R_MULTIVIEW) != 0; + IMB_Proxy_Size proxy_size = seq_rendersize_to_proxysize(context->preview_render_size); + + if ((seq->flag & SEQ_USE_PROXY) == 0) { + proxy_size = IMB_PROXY_NONE; + } + /* load all the videos */ seq_open_anim_file(context->scene, seq, false); @@ -3158,7 +3165,6 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, for (i = 0, sanim = seq->anims.first; sanim; sanim = sanim->next, i++) { if (sanim->anim) { - IMB_Proxy_Size proxy_size = seq_rendersize_to_proxysize(context->preview_render_size); IMB_anim_set_preseek(sanim->anim, seq->anim_preseek); ibuf_arr[i] = IMB_anim_absolute(sanim->anim, @@ -3229,7 +3235,6 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, monoview_movie: sanim = seq->anims.first; if (sanim && sanim->anim) { - IMB_Proxy_Size proxy_size = seq_rendersize_to_proxysize(context->preview_render_size); IMB_anim_set_preseek(sanim->anim, seq->anim_preseek); ibuf = IMB_anim_absolute(sanim->anim, -- cgit v1.2.3