Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <ISS>2019-10-23 03:30:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-23 06:58:48 +0300
commit0d8df072325aed2d092d5c6ee03035a2793edd7a (patch)
tree3acf6298a9b29a745ef56b7221050f6508aafc69 /source/blender/blenkernel/intern/sound.c
parent6c1cc08da3bab263db0bb65b5f0662cfd05a7d14 (diff)
Fix T70845: Crash when switching scene of scene strip.
Crash on assert in `sound_verify_evaluated_id()` Reviewed By: sergey Maniphest Tasks: T70845 Differential Revision: https://developer.blender.org/D6104
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
-rw-r--r--source/blender/blenkernel/intern/sound.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 6cbb01861e2..d42436ecb40 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -677,6 +677,9 @@ void BKE_sound_set_cfra(int cfra)
void BKE_sound_set_scene_volume(Scene *scene, float volume)
{
sound_verify_evaluated_id(&scene->id);
+ if (scene->sound_scene == NULL) {
+ return;
+ }
AUD_Sequence_setAnimationData(scene->sound_scene,
AUD_AP_VOLUME,
CFRA,