Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-09-17 01:20:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-09-17 01:20:21 +0400
commit66d465cbccbc25303f402fd06288731166f60bef (patch)
tree6d11c15651716b08bcde2d3846e99e03edce6b59 /intern
parent2228c455f98f4987a7b6acc8f1d4d1b57079d832 (diff)
Fix #36731: border render not updating properly with persistent images
setting enabled in cycles.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_session.cpp9
1 files changed, 5 insertions, 4 deletions
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);