[Bf-blender-cvs] [035d4c28aba] master: Add sanity NULL checks when loading sound sequences

[Sebastian Parborg]

Commit: 035d4c28abaf351b36ff5bb6057f865888790331
Author: Sebastian Parborg
Date:   Mon Aug 16 16:50:54 2021 +0200
Branches: master
https://developer.blender.org/rB035d4c28abaf351b36ff5bb6057f865888790331

Add sanity NULL checks when loading sound sequences

Would cause crashes in files that had lingering invalid sound sequences around.
For example our tests/render/volume/fire.blend test file.

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

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

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

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index bd0fbd840ff..8730d2758e6 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -703,7 +703,7 @@ void *BKE_sound_scene_add_scene_sound(
     Scene *scene, Sequence *sequence, int startframe, int endframe, int frameskip)
 {
   sound_verify_evaluated_id(&scene->id);
-  if (sequence->scene && scene != sequence->scene) {
+  if (sequence->scene && scene != sequence->scene && sequence->sound) {
     const double fps = FPS;
     return AUD_Sequence_add(scene->sound_scene,
                             sequence->scene->sound_scene,
@@ -775,7 +775,7 @@ void BKE_sound_move_scene_sound(
 void BKE_sound_move_scene_sound_defaults(Scene *scene, Sequence *sequence)
 {
   sound_verify_evaluated_id(&scene->id);
-  if (sequence->scene_sound) {
+  if (sequence->scene_sound && sequence->sound) {
     BKE_sound_move_scene_sound(scene,
                                sequence->scene_sound,
                                sequence->startdisp,