From 66d465cbccbc25303f402fd06288731166f60bef Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 16 Sep 2013 21:20:21 +0000 Subject: Fix #36731: border render not updating properly with persistent images setting enabled in cycles. --- intern/cycles/blender/blender_session.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 23390060118..84ff071171b 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -165,10 +165,11 @@ void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_) /* sync object should be re-created */ sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU); - if(b_rv3d) { - sync->sync_data(b_v3d, b_engine.camera_override()); - sync->sync_camera(b_render, b_engine.camera_override(), width, height); - } + /* for final render we will do full data sync per render layer, only + * do some basic syncing here, no objects or materials for speed */ + sync->sync_render_layers(b_v3d, NULL); + sync->sync_integrator(); + sync->sync_camera(b_render, b_engine.camera_override(), width, height); BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height); session->reset(buffer_params, session_params.samples); -- cgit v1.2.3