Use new IOHelperOrientation class to handle forward/up axes.

Helps ensuring common behavior, and saves quite a few lines of code, too...

1 files changed, 4 insertions, 51 deletions

diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 4311b28b..85f3bfb2 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Autodesk 3DS format",
     "author": "Bob Holcomb, Campbell Barton",
-    "blender": (2, 57, 0),
+    "blender": (2, 73, 0),
     "location": "File > Import-Export",
     "description": "Import-Export 3DS, meshes, uvs, materials, textures, "
                    "cameras & lamps",
@@ -44,11 +44,12 @@ from bpy.props import StringProperty, FloatProperty, BoolProperty, EnumProperty
 
 from bpy_extras.io_utils import (ImportHelper,
                                  ExportHelper,
+                                 IOHelperOrientation,
                                  axis_conversion,
                                  )
 
 
-class Import3DS(bpy.types.Operator, ImportHelper):
+class Import3DS(bpy.types.Operator, ImportHelper, IOHelperOrientation):
     """Import from 3DS file format (.3ds)"""
     bl_idname = "import_scene.autodesk_3ds"
     bl_label = 'Import 3DS'
@@ -78,30 +79,6 @@ class Import3DS(bpy.types.Operator, ImportHelper):
             default=True,
             )
 
-    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='Y',
-            )
-
-    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='Z',
-            )
-
     def execute(self, context):
         from . import import_3ds
 
@@ -118,7 +95,7 @@ class Import3DS(bpy.types.Operator, ImportHelper):
         return import_3ds.load(self, context, **keywords)
 
 
-class Export3DS(bpy.types.Operator, ExportHelper):
+class Export3DS(bpy.types.Operator, ExportHelper, IOHelperOrientation):
     """Export to 3DS file format (.3ds)"""
     bl_idname = "export_scene.autodesk_3ds"
     bl_label = 'Export 3DS'
@@ -135,30 +112,6 @@ class Export3DS(bpy.types.Operator, ExportHelper):
             default=False,
             )
 
-    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='Y',
-            )
-
-    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='Z',
-            )
-
     def execute(self, context):
         from . import export_3ds