Merge pull request #627 from gamingrobot/5.0-get-set-fix

Use set_transform and get_transform to fix compatibility with 5.0.

Author: pragma37

BlenderMalt/MaltMaterial.py

@@ -1,6 +1,6 @@
 import os
 import bpy
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 from . MaltProperties import MaltPropertyGroup
 
 _MATERIALS = {}
@@ -28,7 +28,7 @@ def poll_tree(self, object):
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     shader_source : bpy.props.StringProperty(name="Shader Source", subtype='FILE_PATH', update=update_source,
-        set=malt_path_setter('shader_source'), get=malt_path_getter('shader_source'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     shader_nodes : bpy.props.PointerProperty(name="Node Tree", type=bpy.types.NodeTree, update=update_nodes, poll=poll_tree,

BlenderMalt/MaltNodes/MaltNodeTree.py

@@ -3,7 +3,7 @@
 import bpy
 from BlenderMalt.MaltProperties import MaltPropertyGroup
 from BlenderMalt import MaltPipeline
-from BlenderMalt.MaltUtils import malt_path_setter, malt_path_getter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 
 from BlenderMalt.MaltNodes.MaltNode import MaltNode
 
@@ -67,7 +67,7 @@ def update_graph_type(self, context):
     library_source : bpy.props.StringProperty(name="Local Library", subtype='FILE_PATH',
         options={'LIBRARY_EDITABLE'},
         override={'LIBRARY_OVERRIDABLE'},
-        set=malt_path_setter('library_source'), get=malt_path_getter('library_source'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     disable_updates : bpy.props.BoolProperty(name="Disable Updates", default=False,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})

BlenderMalt/MaltPipeline.py

@@ -1,6 +1,6 @@
 import os, platform, time
 import bpy
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 from . import MaltMaterial, MaltMeshes, MaltTextures
 
 _BRIDGE = None
@@ -105,11 +105,11 @@ def update_pipeline_settings(self, context):
         self.update_pipeline(context)
 
     pipeline : bpy.props.StringProperty(name="Malt Pipeline", subtype='FILE_PATH', update=update_pipeline_settings,
-        set=malt_path_setter('pipeline'), get=malt_path_getter('pipeline'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     plugins_dir : bpy.props.StringProperty(name="Local Plugins", subtype='DIR_PATH', update=update_pipeline_settings,
-        set=malt_path_setter('plugins_dir'), get=malt_path_getter('plugins_dir'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     viewport_bit_depth : bpy.props.EnumProperty(items=[('8', '8', ''),('16', '16', ''),('32', '32', '')], 

BlenderMalt/MaltUtils.py

@@ -25,15 +25,11 @@ def invoke(self, context, event):
         return {'RUNNING_MODAL'}
 
 # Always store paths in UNIX format so saved files work across OSs
-def malt_path_setter(property_name):
-    def setter(self, value):
-        self[property_name] = value.replace('\\','/')
-    return setter
-
-def malt_path_getter(property_name):
-    def getter(self):
-        return self.get(property_name,'').replace('\\','/')
-    return getter
+def malt_path_set_transform(self, new_value, curr_value, is_set):
+    return new_value.replace('\\','/')
+
+def malt_path_get_transform(self, curr_value, is_set):
+    return curr_value.replace('\\','/')
 
 # Operator buttons are generated every time the UI is redrawn.
 # The UI is redrawn for every frame the cursor hovers over it

BlenderMalt/__init__.py

@@ -21,7 +21,7 @@
 __MALT_DEPENDENCIES_PATH = path.join(__MALT_PATH,'Malt','.Dependencies-{}'.format(_PY_VERSION))
 if __MALT_DEPENDENCIES_PATH not in sys.path: sys.path.append(__MALT_DEPENDENCIES_PATH)
 
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 
 class Preferences(bpy.types.AddonPreferences):
     # this must match the addon name
@@ -31,13 +31,13 @@ class Preferences(bpy.types.AddonPreferences):
         description="Setups a VSCode project on your .blend file folder")
 
     renderdoc_path : bpy.props.StringProperty(name="RenderDoc Path", subtype='FILE_PATH',
-        set=malt_path_setter('renderdoc_path'), get=malt_path_getter('renderdoc_path'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     plugins_dir : bpy.props.StringProperty(name="Global Plugins", subtype='DIR_PATH',
-        set=malt_path_setter('plugins_dir'), get=malt_path_getter('plugins_dir'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     docs_path : bpy.props.StringProperty(name="Docs Path", subtype='DIR_PATH',
-        set=malt_path_setter('docs_path'), get=malt_path_getter('docs_path'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     render_fps_cap : bpy.props.IntProperty(name="Max Viewport Render Framerate", default=30)