[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27645] trunk/blender/source/blender/ blenkernel/intern/sound.c: Fix for sequencer adding scene strips of the same scene resulting in an endless recursion .

[Joerg Mueller]

Revision: 27645
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27645
Author:   nexyon
Date:     2010-03-21 16:40:36 +0100 (Sun, 21 Mar 2010)

Log Message:
-----------
Fix for sequencer adding scene strips of the same scene resulting in an endless 
recursion.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sound.c

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c      2010-03-21 
14:56:26 UTC (rev 27644)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c      2010-03-21 
15:40:36 UTC (rev 27645)
@@ -348,7 +348,9 @@
 
 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)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs