Merge branch 'master' into blender2.8

# Conflicts: # tests/gtests/alembic/abc_export_test.cc
2017-11-02 14:37:10 +01:00
parent 7eb4ef6cac 8a3728800c
commit f7d59fbc46
6 changed files with 14 additions and 9 deletions
--- 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 */