revert some changes from r2917.

- remove additional axis args.
- use of _TRANSFORM was incorrect.

1 files changed, 8 insertions, 36 deletions

diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py
index a98cb171..79f077e6 100644
--- a/io_scene_x3d/__init__.py
+++ b/io_scene_x3d/__init__.py
@@ -145,44 +145,20 @@ class ExportX3D(bpy.types.Operator, ExportHelper):
             default=False,
             )
             
-    blender_axis_forward = EnumProperty(
-            name="Blender Forward",
+    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',
-            )
-            
-    blender_axis_up = EnumProperty(
-        name="Blender Up",
-        items=(('X', "X Up", ""),
-               ('Y', "Y Up", ""),
-               ('Z', "Z Up", ""),
-               ('-X', "-X Up", ""),
-               ('-Y', "-Y Up", ""),
-               ('-Z', "-Z Up", ""),
                ),
         default='Z',
         )
         
-    x3d_axis_forward = EnumProperty(
-            name="X3D Forward",
-            items=(('X', "X Forward", ""),
-                   ('Y', "Y Forward", ""),
-                   ('Z', "Z Forward", ""),
-                   ('-X', "-X Forward", ""),
-                   ('-Y', "-Y Forward", ""),
-                   ('-Z', "-Z Forward", ""),
-                   ),
-            default='Z',
-            )
-
-    x3d_axis_up = EnumProperty(
-            name="X3D Up",
+    axis_up = EnumProperty(
+            name="Up",
             items=(('X', "X Up", ""),
                    ('Y', "Y Up", ""),
                    ('Z', "Z Up", ""),
@@ -198,17 +174,13 @@ class ExportX3D(bpy.types.Operator, ExportHelper):
     def execute(self, context):
         from . import export_x3d
 
-        keywords = self.as_keywords(ignore=("blender_axis_forward",
-                                            "blender_axis_up",
-                                            "x3d_axis_forward",
-                                            "x3d_axis_up",
+        keywords = self.as_keywords(ignore=("axis_forward",
+                                            "axis_up",
                                             "check_existing",
                                             "filter_glob",
                                             ))
-        global_matrix = axis_conversion(from_forward=self.blender_axis_forward,
-                                        from_up=self.blender_axis_up,
-                                        to_forward=self.x3d_axis_forward,
-                                        to_up=self.x3d_axis_up,
+        global_matrix = axis_conversion(to_forward=self.axis_forward,
+                                        to_up=self.axis_up,
                                         ).to_4x4()
         keywords["global_matrix"] = global_matrix