Commit: 58f7deca583aea1b5a1654965eb96b8441d8db98
Author: Sergey Sharybin
Date: Tue Jan 27 17:13:21 2015 +0500
Branches: master
https://developer.blender.org/rB58f7deca583aea1b5a1654965eb96b8441d8db98
Fix T43429: bpy.ops.render.render() not working with scene in VSE
Was a mistake in threading conflict prevention condition.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index b43e481..76527d9 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2609,7 +2609,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData
*context, Sequence *seq
* When rendering from command line renderer is called from
main thread, in this
* case it's always safe to render scene here
*/
- if (!is_thread_main || is_rendering == false || is_background) {
+ if (!is_thread_main || is_rendering == false || is_background
|| context->eval_ctx->mode == DAG_EVAL_RENDER) {
if (re == NULL)
re = RE_NewRender(scene->id.name);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
