[Bf-blender-cvs] [c11bfb519fd] master: Fix T64153: RenderEngine.update_result does not show result immediately

[Brecht Van Lommel]

Commit: c11bfb519fd2520fbe46914313bb56e2b646a340
Author: Brecht Van Lommel
Date:   Tue Jun 18 13:53:50 2019 +0200
Branches: master
https://developer.blender.org/rBc11bfb519fd2520fbe46914313bb56e2b646a340

Fix T64153: RenderEngine.update_result does not show result immediately

===================================================================

M	intern/cycles/blender/blender_session.cpp
M	source/blender/render/intern/source/external_engine.c

===================================================================

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);
   }