diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-12 14:59:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-12 14:59:48 +0300 |
commit | d266733dadbfe9313728f21f9fe353d8b7c175bf (patch) | |
tree | 92c5e6fc7d6fcfda629918964c8fb42776381899 /source/blender/editors/space_sequencer/sequencer_edit.c | |
parent | dce59530d06c4b1fcc310e51c710bc6e204fe29c (diff) |
Fix T43612: VSE crash clearing proxies
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 8e5f509b13f..aaf398bf3a1 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3499,7 +3499,10 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) if ((seq->flag & SELECT)) { if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, SEQ_TYPE_MULTICAM)) { BKE_sequencer_proxy_set(seq, turnon); - + if (seq->strip->proxy == NULL) { + continue; + } + if (proxy_25) seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_25; else |