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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-05-23 11:34:03 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-05-23 11:34:03 +0300
commit7add6b89bc25a59490f93cad44dfe2887c8006c8 (patch)
treeebdd45f11509f2befc427afd0f080d10eb5855e1 /intern
parent9b2923380092c7e3c771d354f8938c5ca20bfd9d (diff)
Fix T51592: Simplify AO Cycles setting remains active while Simplify is disabled
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_sync.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 08ba535f282..4065439681f 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -329,6 +329,9 @@ void BlenderSync::sync_integrator()
integrator->ao_bounces = get_int(cscene, "ao_bounces_render");
}
}
+ else {
+ integrator->ao_bounces = 0;
+ }
if(integrator->modified(previntegrator))
integrator->tag_update(scene);