[Bf-blender-cvs] [beff56cbbd6] temp-vse-h264-proxy: Merge fix from D10363

Richard Antalik noreply at git.blender.org
Tue Mar 16 15:32:28 CET 2021


Commit: beff56cbbd6357c7891f2ab740e0c4223fee44b5
Author: Richard Antalik
Date:   Tue Mar 16 15:31:55 2021 +0100
Branches: temp-vse-h264-proxy
https://developer.blender.org/rBbeff56cbbd6357c7891f2ab740e0c4223fee44b5

Merge fix from D10363

===================================================================

M	source/blender/sequencer/intern/proxy.c

===================================================================

diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index ec1e9d01e3f..a0e6bc7f4f1 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -398,6 +398,10 @@ static int seq_proxy_context_count(Sequence *seq, Scene *scene)
 
 static bool seq_proxy_need_rebuild(Sequence *seq, struct anim *anim)
 {
+  if ((seq->strip->proxy->build_flags & SEQ_PROXY_SKIP_EXISTING) == 0) {
+    return true;
+  }
+
   IMB_Proxy_Size required_proxies = seq->strip->proxy->build_size_flags;
   IMB_Proxy_Size built_proxies = IMB_anim_proxy_get_existing(anim);
   return (required_proxies & built_proxies) != required_proxies;



More information about the Bf-blender-cvs mailing list