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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-11 20:48:13 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-11 20:48:13 +0400
commitb4343da77fb32c370e087ed71dd14d73178e0dba (patch)
treedaab25170b1881d140027d69c7217d55a8dbd794 /intern/cycles/blender/blender_sync.cpp
parent6686f189480c4de3e91f49a76811bf006ed9f9b2 (diff)
Cycles: fix missing update when removing or hiding objects.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r--intern/cycles/blender/blender_sync.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 1bf85f13fca..1897ff13a64 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -60,6 +60,9 @@ BlenderSync::~BlenderSync()
bool BlenderSync::sync_recalc()
{
+ /* sync recalc flags from blender to cycles. actual update is done separate,
+ so we can do it later on if doing it immediate is not suitable */
+
BL::BlendData::materials_iterator b_mat;
for(b_mat = b_data.materials.begin(); b_mat != b_data.materials.end(); ++b_mat)
@@ -104,6 +107,7 @@ bool BlenderSync::sync_recalc()
object_map.has_recalc() ||
light_map.has_recalc() ||
mesh_map.has_recalc() ||
+ BlendDataObjects_recalc_get(&b_data.ptr) ||
world_recalc;
return recalc;