[Bf-blender-cvs] [d442782dbe5] master: Fix Cycles versioning code after recent change
Sergey Sharybin
noreply at git.blender.org
Fri Apr 29 11:51:58 CEST 2022
Commit: d442782dbe5b6b9f4276a92f97c8327343765287
Author: Sergey Sharybin
Date: Fri Apr 29 11:31:53 2022 +0200
Branches: master
https://developer.blender.org/rBd442782dbe5b6b9f4276a92f97c8327343765287
Fix Cycles versioning code after recent change
Need to use get() instead of is_property_set() for properties
which are not defined as Property.
===================================================================
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 651613b0407..531ecc177da 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -155,16 +155,17 @@ def do_versions(self):
cscene.preview_samples = 10
# Filter
- if not cscene.is_property_set("filter_type"):
+ if cscene.get("filter_type", -1) == -1:
cscene.pixel_filter_type = 'GAUSSIAN'
if version <= (2, 76, 10):
cscene = scene.cycles
- if cscene.is_property_set("filter_type"):
- if not cscene.is_property_set("pixel_filter_type"):
- cscene.pixel_filter_type = cscene.filter_type
- if cscene.filter_type == 'BLACKMAN_HARRIS':
- cscene.filter_type = 'GAUSSIAN'
+ if not cscene.is_property_set("pixel_filter_type"):
+ filter_type_int = cscene.get("filter_type", -1)
+ if filter_type_int == 0:
+ cscene.pixel_filter_type = 'BOX'
+ elif filter_type_int == 1:
+ cscene.pixel_filter_type = 'GAUSSIAN'
if version <= (2, 78, 2):
cscene = scene.cycles
More information about the Bf-blender-cvs
mailing list