kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for [#22236] Seg Fault when rendering sequence with speed effect, [#24160] VSE crash

Browse Source 
* 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.
This commit is contained in:
Janne Karhu 2010-10-06 10:09:44 +00:00
parent 0321f089d6
commit d50cadbe0d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/sequencer.c
View File

@ -1861,6 +1861,15 @@ static ImBuf * seq_render_scene_strip_impl(
if(rendering) if(rendering)
re= RE_NewRender(" do_build_seq_ibuf"); 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 else
re= RE_NewRender(sce->id.name); re= RE_NewRender(sce->id.name);