diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 02:14:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 02:14:38 +0400 |
| commit | 0a4c4d1d1a86e18a9cd5a5f976dd469725743d1e (patch) | |
| tree | d00d013ccc95a3a2de620417bdf991a3f10e0734 /source/blender/blenkernel/intern/sound.c | |
| parent | f7647dc96d6b30b0ecf2d571dc8e8fe2a5440f63 (diff) | |
correct error in own commit r43159, unintentionally removed NULL check
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 8 |
1 files 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) |