[Bf-blender-cvs] [b5244cd5dc1] master: Fix errors in fix for T68018

[Campbell Barton]

Commit: b5244cd5dc1aa9ac70f926435e1449aa77548fae
Author: Campbell Barton
Date:   Sun Nov 3 17:56:05 2019 +1100
Branches: master
https://developer.blender.org/rBb5244cd5dc1aa9ac70f926435e1449aa77548fae

Fix errors in fix for T68018

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

M       source/blender/blenkernel/intern/sequencer.c
M       source/blender/editors/space_sequencer/sequencer_edit.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c 
b/source/blender/blenkernel/intern/sequencer.c
index 9f7dc8444ed..b99d6e1684a 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2107,11 +2107,11 @@ bool BKE_sequencer_proxy_rebuild_context(Main *bmain,
   int i;
 
   if (!seq->strip || !seq->strip->proxy) {
-    return;
+    return true;
   }
 
   if (!(seq->flag & SEQ_USE_PROXY)) {
-    return;
+    return true;
   }
 
   num_files = seq_proxy_context_count(seq, scene);
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c 
b/source/blender/editors/space_sequencer/sequencer_edit.c
index dc4299b637b..ed384cfc1a8 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -219,8 +219,7 @@ static void seq_proxy_build_job(const bContext *C, 
ReportList *reports)
       bool success = BKE_sequencer_proxy_rebuild_context(
           pj->main, pj->depsgraph, pj->scene, seq, file_list, &pj->queue);
       if (!success) {
-
-        BKE_reportf(reports, RPT_ERROR, "Could not build proxy for strip %s", 
&seq->name);
+        BKE_reportf(reports, RPT_ERROR, "Could not build proxy for strip %s", 
seq->name);
       }
     }
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs