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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-10 02:00:29 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-10 02:10:52 +0300
commit5a45ccaf3e5102ee571599fa9f26a78ac1f6d0f4 (patch)
tree352b6b75c1b542aacb783296922c3ae85bcb8732 /intern/cycles/blender/addon/properties.py
parentd6e936254eb90496f21e97bdd00b1b8dacbf9b35 (diff)
Fix T47377: Newer file crashes at render on official 2.76b version
Really annoying bug, the code was not forward compatible at all and resulted in crash. And it is really good to keep at least one release forward compatibility so possible regressions could be verified easily. The idea now is to use new property name for the pixel filter type, but keep old property around for a couple of releases, so we have at least some forward compatibility. Don't like this situation at all, but seems it's least of the evil we can choose. Thanks Brecht for the review!
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
-rw-r--r--intern/cycles/blender/addon/properties.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 81dafb82d51..5238a35f47c 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -376,12 +376,24 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
default=False,
)
+ # Really annoyingly, we have to keep it around for a few releases,
+ # otherwise forward compatibility breaks in really bad manner: CRASH!
+ #
+ # TODO(sergey): Remove this during 2.8x series of Blender.
cls.filter_type = EnumProperty(
name="Filter Type",
description="Pixel filter type",
items=enum_filter_types,
default='BLACKMAN_HARRIS',
)
+
+ cls.pixel_filter_type = EnumProperty(
+ name="Filter Type",
+ description="Pixel filter type",
+ items=enum_filter_types,
+ default='BLACKMAN_HARRIS',
+ )
+
cls.filter_width = FloatProperty(
name="Filter Width",
description="Pixel filter width",