[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32343] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Fix for [#22236] Seg Fault when rendering sequence with speed effect, [#24160] VSE crash

[Janne Karhu]

Revision: 32343
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32343
Author:   jhk
Date:     2010-10-06 12:09:44 +0200 (Wed, 06 Oct 2010)

Log Message:
-----------
Fix for [#22236] Seg Fault when rendering sequence with speed effect, [#24160] VSE crash
* Override the default render name in the case of the sequence renderer scene being included as a strip in the sequencer.
* Somebody with deeper insight to the rendering pipeline should probably check if this is the best way to handle this.

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

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-10-06 10:00:15 UTC (rev 32342)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-10-06 10:09:44 UTC (rev 32343)
@@ -1861,6 +1861,15 @@
 		
 		if(rendering)
 			re= RE_NewRender(" do_build_seq_ibuf");
+		/* If the top level scene that does the sequencer rendering is included 
+		 * as a strip the default render name for the strip will conflict with
+		 * the original render, so override the name in this case.
+		 * See bugs #22236 and #24160 for examples.
+		 * XXX: Somebody with deeper insight to the rendering pipeline should
+		 *      probably check if this is the best way to handle this. -jahka
+		 */
+		else if(seq->scene == scene)
+			re= RE_NewRender("scene_conflict_render");
 		else
 			re= RE_NewRender(sce->id.name);