[Bf-blender-cvs] [4e15eddb526] master: Fix T52890: Crash unlinking sequencer sound

Campbell Barton noreply at git.blender.org
Mon Sep 25 02:17:39 CEST 2017


Commit: 4e15eddb526f128fc0b13f6d28cb7384d68cfedf
Author: Campbell Barton
Date:   Mon Sep 25 10:28:17 2017 +1000
Branches: master
https://developer.blender.org/rB4e15eddb526f128fc0b13f6d28cb7384d68cfedf

Fix T52890: Crash unlinking sequencer sound

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

M	source/blender/makesrna/intern/rna_sequencer.c

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

diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index f628c5f14d9..520a1c2f730 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -725,8 +725,9 @@ static void rna_Sequence_filepath_update(Main *bmain, Scene *UNUSED(scene), Poin
 static void rna_Sequence_sound_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	Sequence *seq = (Sequence *) ptr->data;
-
-	BKE_sound_update_scene_sound(seq->scene_sound, seq->sound);
+	if (seq->sound != NULL) {
+		BKE_sound_update_scene_sound(seq->scene_sound, seq->sound);
+	}
 	rna_Sequence_update(bmain, scene, ptr);
 }



More information about the Bf-blender-cvs mailing list