diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-03 09:56:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-03 09:56:05 +0300 |
commit | b5244cd5dc1aa9ac70f926435e1449aa77548fae (patch) | |
tree | 0382931a8dd001587fd6d7d9f99c119c86a0cc3f /source/blender | |
parent | d4bef6a215080e99119089148c0368e60c43f436 (diff) |
Fix errors in fix for T68018
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 3 |
2 files changed, 3 insertions, 4 deletions
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); } } } |