diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
commit | f7d59fbc460cd2e544c855d8088c98aacf90cfdd (patch) | |
tree | 81ed5a9b6996845aee4ee48b3febf0c696f2f2be /intern/cycles/blender/blender_session.cpp | |
parent | 7eb4ef6cacbb4cf0fbc2ff01d2e1a5fa133072cf (diff) | |
parent | 8a3728800cac83a0a9e524790ff46b7eca82cfbd (diff) |
Merge branch 'master' into blender2.8
# Conflicts:
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 1c1ca43b56a..567afca6707 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -346,7 +346,7 @@ 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, highlight, true); + end_render_result(b_engine, b_rr, true, highlight, false); } else { /* write result */ |