From bfbabc0592b820ec948fa355805ed78a882f4943 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Wed, 14 Jan 2015 13:08:57 +0100
Subject: Use new IOHelperOrientation class to handle forward/up axes.

Helps ensuring common behavior, and saves quite a few lines of code, too...
---
 io_scene_obj/__init__.py | 54 +++++-------------------------------------------
 1 file changed, 5 insertions(+), 49 deletions(-)

(limited to 'io_scene_obj')

diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index 2ce74f0d..6271a250 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -21,8 +21,8 @@
 bl_info = {
     "name": "Wavefront OBJ format",
     "author": "Campbell Barton, Bastien Montagne",
-    "version": (2, 0, 0),
-    "blender": (2, 58, 0),
+    "version": (2, 0, 1),
+    "blender": (2, 73, 0),
     "location": "File > Import-Export",
     "description": "Import-Export OBJ, Import OBJ mesh, UV's, "
                    "materials and textures",
@@ -48,12 +48,13 @@ from bpy.props import (BoolProperty,
                        )
 from bpy_extras.io_utils import (ImportHelper,
                                  ExportHelper,
+                                 IOHelperOrientation,
                                  path_reference_mode,
                                  axis_conversion,
                                  )
 
 
-class ImportOBJ(bpy.types.Operator, ImportHelper):
+class ImportOBJ(bpy.types.Operator, ImportHelper, IOHelperOrientation):
     """Load a Wavefront OBJ File"""
     bl_idname = "import_scene.obj"
     bl_label = "Import OBJ"
@@ -119,29 +120,6 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
             soft_min=0.0, soft_max=1000.0,
             default=0.0,
             )
-    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='-Z',
-            )
-
-    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='Y',
-            )
 
     def execute(self, context):
         # print("Selected: " + context.active_object.name)
@@ -199,7 +177,7 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
         layout.prop(self, "use_image_search")
 
 
-class ExportOBJ(bpy.types.Operator, ExportHelper):
+class ExportOBJ(bpy.types.Operator, ExportHelper, IOHelperOrientation):
     """Save a Wavefront OBJ File"""
 
     bl_idname = "export_scene.obj"
@@ -302,28 +280,6 @@ class ExportOBJ(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='-Z',
-            )
-    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='Y',
-            )
     global_scale = FloatProperty(
             name="Scale",
             min=0.01, max=1000.0,
-- 
cgit v1.2.3