archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for sequencer adding scene strips of the same scene resulting in an endless recursion.

Browse Source
This commit is contained in:
Joerg Mueller
2010-03-21 15:40:36 +00:00
parent 247b7249bd
commit f61b3ac81a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/sound.c
View File

@@ -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)