From 0a4c4d1d1a86e18a9cd5a5f976dd469725743d1e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Jan 2012 22:14:38 +0000 Subject: correct error in own commit r43159, unintentionally removed NULL check --- source/blender/blenkernel/intern/sound.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 80485c12b1a..649984a7934 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -490,9 +490,11 @@ void sound_move_scene_sound(struct Scene *scene, void* handle, int startframe, i void sound_move_scene_sound_defaults(struct Scene *scene, struct Sequence* sequence) { - sound_move_scene_sound(scene, sequence->scene_sound, - sequence->startdisp, sequence->enddisp, - sequence->startofs + sequence->anim_startofs); + if (sequence->scene_sound) { + sound_move_scene_sound(scene, sequence->scene_sound, + sequence->startdisp, sequence->enddisp, + sequence->startofs + sequence->anim_startofs); + } } void sound_update_scene_sound(void* handle, struct bSound* sound) -- cgit v1.2.3