diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index db673a8d625..f81de7d529a 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -261,9 +261,9 @@ static BL::RenderResult begin_render_result(BL::RenderEngine b_engine, int x, in return b_engine.begin_result(x, y, w, h, layername); } -static void end_render_result(BL::RenderEngine b_engine, BL::RenderResult b_rr, bool cancel = false) +static void end_render_result(BL::RenderEngine b_engine, BL::RenderResult b_rr, bool cancel, bool do_merge_results) { - b_engine.end_result(b_rr, (int)cancel); + b_engine.end_result(b_rr, (int)cancel, (int)do_merge_results); } void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_update_only) @@ -302,12 +302,12 @@ void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_upda update_render_result(b_rr, b_rlay, rtile); } - end_render_result(b_engine, b_rr, true); + end_render_result(b_engine, b_rr, true, true); } else { /* write result */ write_render_result(b_rr, b_rlay, rtile); - end_render_result(b_engine, b_rr); + end_render_result(b_engine, b_rr, false, true); } } @@ -352,7 +352,7 @@ void BlenderSession::render() /* layer will be missing if it was disabled in the UI */ if(b_single_rlay == b_rr.layers.end()) { - end_render_result(b_engine, b_rr, true); + end_render_result(b_engine, b_rr, true, false); continue; } @@ -379,7 +379,7 @@ void BlenderSession::render() } /* free result without merging */ - end_render_result(b_engine, b_rr, true); + end_render_result(b_engine, b_rr, true, false); buffer_params.passes = passes; scene->film->tag_passes_update(scene, passes); |