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 <richardantalik@gmail.com>2019-01-14 08:25:29 +0300
committerRichard Antalik <richardantalik@gmail.com>2019-01-14 08:57:08 +0300
commitc450461e68cdd723825c7bf4a4ebde079ba7b57b (patch)
treedfd5a5c77bdc3bba16841fe43fb5a3db48c07bb8 /source/blender/blenkernel/intern/sound.c
parente1c4dc7a64c68e69cd47a98d2c9aae0857186719 (diff)
Fix crash on scene unlink
Reviewed by: Brecht Differential Revision: https://developer.blender.org/D4200
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
-rw-r--r--source/blender/blenkernel/intern/sound.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 829f0e0ab89..39c13031f13 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -515,7 +515,7 @@ void BKE_sound_update_scene_listener(struct Scene *scene)
void *BKE_sound_scene_add_scene_sound(struct Scene *scene, struct Sequence *sequence,
int startframe, int endframe, int frameskip)
{
- if (scene != sequence->scene) {
+ if (sequence->scene && scene != sequence->scene) {
const double fps = FPS;
return AUD_Sequence_add(scene->sound_scene, sequence->scene->sound_scene,
startframe / fps, endframe / fps, frameskip / fps);