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@blender.org>2022-04-29 12:31:53 +0300
committerSergey Sharybin <sergey@blender.org>2022-04-29 12:49:53 +0300
commitd442782dbe5b6b9f4276a92f97c8327343765287 (patch)
treebe23fa91d83f0c28f147da705b3484e3fa778494 /intern
parent62eb190d4e4e329ea0143147e81bffce698c6361 (diff)
Fix Cycles versioning code after recent change
Need to use get() instead of is_property_set() for properties which are not defined as Property.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/version_update.py13
1 files changed, 7 insertions, 6 deletions
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