[Bf-blender-cvs] [24d71acd864] master: Fix Cycles rendering files with Simplify wrong after recent changes

[Brecht Van Lommel]

Commit: 24d71acd864bae8d7c746c873b034d69383cda4f
Author: Brecht Van Lommel
Date:   Tue Apr 6 15:34:13 2021 +0200
Branches: master
https://developer.blender.org/rB24d71acd864bae8d7c746c873b034d69383cda4f

Fix Cycles rendering files with Simplify wrong after recent changes

The versioning code was not taking into account the old default for AO
bounces.

===================================================================

M	intern/cycles/blender/addon/version_update.py

===================================================================

diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 7c57bdf453c..827f84b9873 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -219,9 +219,12 @@ def do_versions(self):
 
             if version <= (2, 93, 16):
                 cscene = scene.cycles
-                if scene.render.use_simplify and \
-                   (cscene.ao_bounces or cscene.ao_bounces_render):
+                ao_bounces = cscene.get("ao_bounces", 0)
+                ao_bounces_render = cscene.get("ao_bounces_render", 0)
+                if scene.render.use_simplify and (ao_bounces or ao_bounces_render):
                     cscene.use_fast_gi = True
+                    cscene.ao_bounces = ao_bounces
+                    cscene.ao_bounces_render = ao_bounces_render
                 else:
                     cscene.ao_bounces = 1
                     cscene.ao_bounces_render = 1