diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-23 18:35:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-23 18:35:45 +0300 |
| commit | 99c6601a1ffe744ef8592de5da5920156a1097a6 (patch) | |
| tree | 2dd91884fb1bc12144f4d585c4591db354725134 /intern | |
| parent | 3db15ae23a542f60926baea24f838c8510371743 (diff) | |
| parent | 7b25ffb618dd7509d425f7a5891c64d4a3668743 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index d4ae1fc6c9d..138ea4dfad2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -331,6 +331,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); |