diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 14:53:50 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 14:59:55 +0300 |
commit | c11bfb519fd2520fbe46914313bb56e2b646a340 (patch) | |
tree | 8a280a3f16881c5e9cb77a687a3d55e35e4081ae | |
parent | 00b10f9c3f24afdd3307631209906ff79298f508 (diff) |
Fix T64153: RenderEngine.update_result does not show result immediately
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 5 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 38d2f3f64e2..489e1ca90eb 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -363,8 +363,9 @@ void BlenderSession::do_write_update_render_tile(RenderTile &rtile, if (merge) { update_render_result(b_rr, b_rlay, rtile); } - - end_render_result(b_engine, b_rr, true, highlight, merge); + else { + end_render_result(b_engine, b_rr, true, highlight, merge); + } } else { /* Write final render result. */ diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 0292a807131..0db1a4b81ae 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -240,6 +240,7 @@ void RE_engine_update_result(RenderEngine *engine, RenderResult *result) Render *re = engine->re; if (result) { + render_result_merge(re->result, result); result->renlay = result->layers.first; /* weak, draws first layer always */ re->display_update(re->duh, result, NULL); } |