[Bf-blender-cvs] [4d043b5c17f] master: Fix crash on unlinking scene

Richard Antalik noreply at git.blender.org
Wed May 1 14:40:31 CEST 2019


Commit: 4d043b5c17fbdf9c68600f15745f687d6d6b57ef
Author: Richard Antalik
Date:   Wed May 1 05:16:55 2019 -0700
Branches: master
https://developer.blender.org/rB4d043b5c17fbdf9c68600f15745f687d6d6b57ef

Fix crash on unlinking scene

Fix crash when unlinking scene and "Use Sequence" property is set.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D4756

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 30d2e2a8d66..f629f6a6d00 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1312,7 +1312,7 @@ ListBase *BKE_sequence_seqbase_get(Sequence *seq, int *r_offset)
       break;
     }
     case SEQ_TYPE_SCENE: {
-      if (seq->flag & SEQ_SCENE_STRIPS) {
+      if (seq->flag & SEQ_SCENE_STRIPS && seq->scene) {
         Editing *ed = BKE_sequencer_editing_get(seq->scene, false);
         if (ed) {
           seqbase = &ed->seqbase;



More information about the Bf-blender-cvs mailing list