[Bf-blender-cvs] [e52d78978ae] master: Fix crash in sequencer after recent audio changes

Sergey Sharybin noreply at git.blender.org
Mon Jun 17 15:23:46 CEST 2019


Commit: e52d78978aee81ebb295046d2c685442cad1fe56
Author: Sergey Sharybin
Date:   Mon Jun 17 15:23:24 2019 +0200
Branches: master
https://developer.blender.org/rBe52d78978aee81ebb295046d2c685442cad1fe56

Fix crash in sequencer after recent audio changes

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index a250b005bad..09e05a9d93a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2468,8 +2468,10 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene)
       }
     }
     if (seq->scene_sound) {
-      if (scene->id.recalc & ID_RECALC_AUDIO || seq->sound->id.recalc & ID_RECALC_AUDIO) {
-        BKE_sound_update_scene_sound(seq->scene_sound, seq->sound);
+      if (seq->sound != NULL) {
+        if (scene->id.recalc & ID_RECALC_AUDIO || seq->sound->id.recalc & ID_RECALC_AUDIO) {
+          BKE_sound_update_scene_sound(seq->scene_sound, seq->sound);
+        }
       }
       BKE_sound_set_scene_sound_volume(
           seq->scene_sound, seq->volume, (seq->flag & SEQ_AUDIO_VOLUME_ANIMATED) != 0);



More information about the Bf-blender-cvs mailing list