[Bf-blender-cvs] [a19aa090d2e] master: VSE: Fix building image proxies

Richard Antalik noreply at git.blender.org
Thu Apr 8 18:58:59 CEST 2021


Commit: a19aa090d2e6504ba1a0b7b5aad045d4d583d3ea
Author: Richard Antalik
Date:   Thu Apr 8 18:36:55 2021 +0200
Branches: master
https://developer.blender.org/rBa19aa090d2e6504ba1a0b7b5aad045d4d583d3ea

VSE: Fix building image proxies

Broken by 04e1feb83051

Caused by accidentaly moving `SEQ_proxy_rebuild_finish` outside of
`if (nseq->type == SEQ_TYPE_MOVIE)` condition in function
`SEQ_proxy_rebuild_context()`.

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

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

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

diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index a0e6bc7f4f1..14667c53421 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -472,10 +472,10 @@ bool SEQ_proxy_rebuild_context(Main *bmain,
                                                               context->quality,
                                                               context->overwrite,
                                                               file_list);
-    }
-    if (!context->index_context) {
-      SEQ_proxy_rebuild_finish(context, false);
-      return false;
+      if (!context->index_context) {
+        MEM_freeN(context);
+        return false;
+      }
     }
 
     link = BLI_genericNodeN(context);



More information about the Bf-blender-cvs mailing list