diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-03-21 18:40:36 +0300 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-03-21 18:40:36 +0300 |
| commit | f61b3ac81ab6e1925c6dfc7ff45fd5dac44a0f36 (patch) | |
| tree | 4b23cd2010a09beb510c834e0fc46dde1f1869e8 /source/blender/blenkernel/intern/sound.c | |
| parent | 247b7249bd14f370aad991f176a1aafb5acefc45 (diff) | |
Fix for sequencer adding scene strips of the same scene resulting in an endless recursion.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index d40d4e02dc7..7308146ef92 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -348,7 +348,9 @@ void sound_destroy_scene(struct Scene *scene) void* sound_scene_add_scene_sound(struct Scene *scene, struct Sequence* sequence, int startframe, int endframe, int frameskip) { - return AUD_addSequencer(scene->sound_scene, &(sequence->scene->sound_scene), startframe / FPS, endframe / FPS, frameskip / FPS, sequence); + if(scene != sequence->scene) + return AUD_addSequencer(scene->sound_scene, &(sequence->scene->sound_scene), startframe / FPS, endframe / FPS, frameskip / FPS, sequence); + return NULL; } void* sound_add_scene_sound(struct Scene *scene, struct Sequence* sequence, int startframe, int endframe, int frameskip) |