diff options
author | Janne Karhu <jhkarh@gmail.com> | 2010-10-06 14:09:44 +0400 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2010-10-06 14:09:44 +0400 |
commit | d50cadbe0dd5a676c23e40b8a2939345442a4f28 (patch) | |
tree | 09f50ca89e20797332a71cd584428f902f82c1f1 /source/blender/blenkernel | |
parent | 0321f089d6e7d8321b8b5b3b48b367038b58b0db (diff) |
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.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 430d6f87619..8c496fea3b0 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -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); |