From 262a0988466e95ab31b834a6479b8be7ec1023d6 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Tue, 16 Mar 2021 23:15:11 +0100 Subject: Fix issues with automatic proxy building After merging patches and resolving conflicts, typo prevented correct operation. This uncovered crash on NULL dereference as well. --- source/blender/editors/space_sequencer/sequencer_add.c | 2 +- source/blender/makesrna/intern/rna_space.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 63946778a19..5d6d24dae74 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -577,7 +577,7 @@ static IMB_Proxy_Size seq_get_proxy_size_flags(bContext *C) static void seq_build_proxy(bContext *C, Sequence *seq) { - if (U.sequencer_proxy_setup == USER_SEQ_PROXY_SETUP_AUTOMATIC) { + if (U.sequencer_proxy_setup != USER_SEQ_PROXY_SETUP_AUTOMATIC) { return; } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 8377a8fbf3f..c0b40bfd526 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2254,7 +2254,7 @@ static void seq_build_proxy(bContext *C, PointerRNA *ptr) ProxyJob *pj = ED_seq_proxy_job_get(C, wm_job); LISTBASE_FOREACH (Sequence *, seq, seqbase) { - if (seq->type != SEQ_TYPE_MOVIE) { + if (seq->type != SEQ_TYPE_MOVIE || seq->strip == NULL || seq->strip->proxy == NULL) { continue; } -- cgit v1.2.3