Fix for [#22236] Seg Fault when rendering sequence with speed effect, [#24160] VSE...
authorJanne Karhu <jhkarh@gmail.com>
Wed, 6 Oct 2010 10:09:44 +0000 (10:09 +0000)
committerJanne Karhu <jhkarh@gmail.com>
Wed, 6 Oct 2010 10:09:44 +0000 (10:09 +0000)
* 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.

source/blender/blenkernel/intern/sequencer.c

index 430d6f8..8c496fe 100644 (file)
@@ -1861,6 +1861,15 @@ static ImBuf * seq_render_scene_strip_impl(
                
                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);