Fix T43612: VSE crash clearing proxies
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Feb 2015 11:59:04 +0000 (22:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Feb 2015 11:59:48 +0000 (22:59 +1100)
source/blender/editors/space_sequencer/sequencer_edit.c

index 8e5f509b13f40a3658ae86c0e30f1535d2056831..aaf398bf3a1ff432b6aa9cae4438acc69d7d68f8 100644 (file)
@@ -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->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 
                                if (proxy_25)
                                        seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_25;
                                else