Commit: d266733dadbfe9313728f21f9fe353d8b7c175bf
Author: Campbell Barton
Date: Thu Feb 12 22:59:04 2015 +1100
Branches: master
https://developer.blender.org/rBd266733dadbfe9313728f21f9fe353d8b7c175bf
Fix T43612: VSE crash clearing proxies
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c
b/source/blender/editors/space_sequencer/sequencer_edit.c
index 8e5f509..aaf398b 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
