correct error in own commit r43159, unintentionally removed NULL check
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 22:14:38 +0000 (22:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 22:14:38 +0000 (22:14 +0000)
source/blender/blenkernel/intern/sound.c

index 80485c12b1a29af45330191d6f7bc58cacd220a7..649984a79344e7856c05256ce9348d13da4d464b 100644 (file)
@@ -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)