diff options
author | Richard Antalik <richardantalik@gmail.com> | 2019-06-07 01:23:53 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2019-06-07 02:23:39 +0300 |
commit | aa003c73245f6727a472f843e0216b7f92ae0c64 (patch) | |
tree | ebcf71bfe7134e920c8b992519190c74e9cf52f0 | |
parent | 9c0060572928d75faf999f148fc49570bee765e7 (diff) |
FIX: `use_proxy` strip property state has no effect.
Author: Olly Funkster, Richard AntalĂk
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2504
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 9 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 1 |
2 files changed, 8 insertions, 2 deletions
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, diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 3915c989614..02b65e5a7b4 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2022,6 +2022,7 @@ static void rna_def_proxy(StructRNA *srna) RNA_def_property_ui_text( prop, "Use Proxy / Timecode", "Use a preview proxy and/or timecode index for this strip"); RNA_def_property_boolean_funcs(prop, NULL, "rna_Sequence_use_proxy_set"); + RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_raw_update"); prop = RNA_def_property(srna, "proxy", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "strip->proxy"); |