diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-03-17 01:15:11 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-03-17 01:18:21 +0300 |
| commit | 262a0988466e95ab31b834a6479b8be7ec1023d6 (patch) | |
| tree | 41b7de31e2f1114189bd003d010d9dbd3ac3ec72 /source/blender/makesrna | |
| parent | 9a56a3865c06b472ac54c0351e270dcf738add07 (diff) | |
Fix issues with automatic proxy building
After merging patches and resolving conflicts, typo prevented correct operation.
This uncovered crash on NULL dereference as well.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |