[Bf-blender-cvs] [0bb9ebd0581] blender2.8: io_utils: remove `orientation_helper_factory`.

Bastien Montagne noreply at git.blender.org
Sun Sep 30 17:31:39 CEST 2018


Commit: 0bb9ebd058114aed9a8f7171fcbee053e2759ee9
Author: Bastien Montagne
Date:   Sun Sep 30 17:30:29 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0bb9ebd058114aed9a8f7171fcbee053e2759ee9

io_utils: remove `orientation_helper_factory`.

Now we only use orientation_helper decorator.

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

M	release/scripts/modules/bpy_extras/io_utils.py

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

diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index c130f890822..e74631256e3 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -22,7 +22,6 @@ __all__ = (
     "ExportHelper",
     "ImportHelper",
     "orientation_helper",
-    "orientation_helper_factory",
     "axis_conversion",
     "axis_conversion_ensure",
     "create_derived_objects",
@@ -123,6 +122,10 @@ class ImportHelper:
 
 
 def orientation_helper(axis_forward='Y', axis_up='Z'):
+    """
+    A decorator for import/export classes, generating properties needed by the axis conversion system and IO helpers,
+    with specified default values (axes).
+    """
     def wrapper(cls):
         def _update_axis_forward(self, context):
             if self.axis_forward[-1] == self.axis_up[-1]:
@@ -167,51 +170,6 @@ def orientation_helper(axis_forward='Y', axis_up='Z'):
     return wrapper
 
 
-def orientation_helper_factory(name, axis_forward='Y', axis_up='Z'):
-    print("WARNING! Using this helper function is deprecated, please switch to orientation_helper decorator instead.")
-    members = {}
-
-    def _update_axis_forward(self, context):
-        if self.axis_forward[-1] == self.axis_up[-1]:
-            self.axis_up = (self.axis_up[0:-1] +
-                            'XYZ'[('XYZ'.index(self.axis_up[-1]) + 1) % 3])
-
-    members['axis_forward'] = EnumProperty(
-        name="Forward",
-        items=(
-            ('X', "X Forward", ""),
-            ('Y', "Y Forward", ""),
-            ('Z', "Z Forward", ""),
-            ('-X', "-X Forward", ""),
-            ('-Y', "-Y Forward", ""),
-            ('-Z', "-Z Forward", ""),
-        ),
-        default=axis_forward,
-        update=_update_axis_forward,
-    )
-
-    def _update_axis_up(self, context):
-        if self.axis_up[-1] == self.axis_forward[-1]:
-            self.axis_forward = (self.axis_forward[0:-1] +
-                                 'XYZ'[('XYZ'.index(self.axis_forward[-1]) + 1) % 3])
-
-    members['axis_up'] = EnumProperty(
-        name="Up",
-        items=(
-            ('X', "X Up", ""),
-            ('Y', "Y Up", ""),
-            ('Z', "Z Up", ""),
-            ('-X', "-X Up", ""),
-            ('-Y', "-Y Up", ""),
-            ('-Z', "-Z Up", ""),
-        ),
-        default=axis_up,
-        update=_update_axis_up,
-    )
-
-    return type(name, (object,), members)
-
-
 # Axis conversion function, not pretty LUT
 # use lookup table to convert between any axis
 _axis_convert_matrix = (



More information about the Bf-blender-cvs mailing list