[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60178] trunk/blender/intern/cycles/ blender/blender_session.cpp: Fix #36731: border render not updating properly with persistent images

[Brecht Van Lommel]

Revision: 60178
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60178
Author:   blendix
Date:     2013-09-16 21:20:21 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Fix #36731: border render not updating properly with persistent images
setting enabled in cycles.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-09-16 21:05:43 UTC (rev 60177)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-09-16 21:20:21 UTC (rev 60178)
@@ -165,10 +165,11 @@
 	/* 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);