blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix issues with automatic proxy building 

After merging patches and resolving conflicts, typo prevented correct operation.
This uncovered crash on NULL dereference as well.
This commit is contained in:
Richard Antalik 2021-03-16 23:15:11 +01:00
parent 9a56a3865c
commit 262a098846
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_sequencer/sequencer_add.c
View File

@ -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;
}

2
source/blender/makesrna/intern/rna_space.c
View File

@ -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;
}