[Bf-blender-cvs] [cf9275dd4e4] master: Fix failing Cycles tests after Cryptomatte changes

[Brecht Van Lommel]

Commit: cf9275dd4e452717faffa0e502814af01d84d539
Author: Brecht Van Lommel
Date:   Mon Dec 7 13:11:17 2020 +0100
Branches: master
https://developer.blender.org/rBcf9275dd4e452717faffa0e502814af01d84d539

Fix failing Cycles tests after Cryptomatte changes

For old files without Cycles cryptomatte settings, must provide the defaults.

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

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 053603fa15c..5dae88d60c7 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -198,11 +198,11 @@ def do_versions(self):
                 if scene.render.engine == 'CYCLES':
                   for view_layer in scene.view_layers:
                     cview_layer = view_layer.cycles
-                    view_layer.use_pass_cryptomatte_object = cview_layer.get("use_pass_crypto_object")
-                    view_layer.use_pass_cryptomatte_material = cview_layer.get("use_pass_crypto_material")
-                    view_layer.use_pass_cryptomatte_asset = cview_layer.get("use_pass_crypto_asset")
-                    view_layer.pass_cryptomatte_depth = cview_layer.get("pass_crypto_depth")
-                    view_layer.use_pass_cryptomatte_accurate = cview_layer.get("pass_crypto_accurate")
+                    view_layer.use_pass_cryptomatte_object = cview_layer.get("use_pass_crypto_object", False)
+                    view_layer.use_pass_cryptomatte_material = cview_layer.get("use_pass_crypto_material", False)
+                    view_layer.use_pass_cryptomatte_asset = cview_layer.get("use_pass_crypto_asset", False)
+                    view_layer.pass_cryptomatte_depth = cview_layer.get("pass_crypto_depth", 6)
+                    view_layer.use_pass_cryptomatte_accurate = cview_layer.get("pass_crypto_accurate", True)
 
         # Lamps
         for light in bpy.data.lights: