diff options
-rw-r--r-- | io_anim_bvh/__init__.py | 29 | ||||
-rw-r--r-- | io_mesh_ply/__init__.py | 27 | ||||
-rw-r--r-- | io_mesh_stl/__init__.py | 53 | ||||
-rw-r--r-- | io_scene_3ds/__init__.py | 55 | ||||
-rw-r--r-- | io_scene_fbx/__init__.py | 53 | ||||
-rw-r--r-- | io_scene_obj/__init__.py | 54 | ||||
-rw-r--r-- | io_scene_vrml2/__init__.py | 30 | ||||
-rw-r--r-- | io_scene_x3d/__init__.py | 53 |
8 files changed, 33 insertions, 321 deletions
diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py index a4a42a99..9ad366e1 100644 --- a/io_anim_bvh/__init__.py +++ b/io_anim_bvh/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "BioVision Motion Capture (BVH) format", "author": "Campbell Barton", - "blender": (2, 57, 0), + "blender": (2, 73, 0), "location": "File > Import-Export", "description": "Import-Export BVH from armature objects", "warning": "", @@ -46,11 +46,12 @@ from bpy.props import (StringProperty, ) from bpy_extras.io_utils import (ImportHelper, ExportHelper, + IOHelperOrientation, axis_conversion, ) -class ImportBVH(bpy.types.Operator, ImportHelper): +class ImportBVH(bpy.types.Operator, ImportHelper, IOHelperOrientation): """Load a BVH motion capture file""" bl_idname = "import_anim.bvh" bl_label = "Import BVH" @@ -108,30 +109,6 @@ class ImportBVH(bpy.types.Operator, ImportHelper): default='NATIVE', ) - 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): keywords = self.as_keywords(ignore=("axis_forward", "axis_up", diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py index f0854821..887c354e 100644 --- a/io_mesh_ply/__init__.py +++ b/io_mesh_ply/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "Stanford PLY format", "author": "Bruce Merry, Campbell Barton", - "blender": (2, 57, 0), + "blender": (2, 73, 0), "location": "File > Import-Export", "description": "Import-Export PLY mesh data withs UV's and vertex colors", "warning": "", @@ -53,6 +53,7 @@ from bpy.props import (CollectionProperty, ) from bpy_extras.io_utils import (ImportHelper, ExportHelper, + IOHelperOrientation, axis_conversion, ) @@ -87,7 +88,7 @@ class ImportPLY(bpy.types.Operator, ImportHelper): return {'FINISHED'} -class ExportPLY(bpy.types.Operator, ExportHelper): +class ExportPLY(bpy.types.Operator, ExportHelper, IOHelperOrientation): """Export a single object as a Stanford PLY with normals, """ \ """colors and texture coordinates""" bl_idname = "export_mesh.ply" @@ -120,28 +121,6 @@ class ExportPLY(bpy.types.Operator, ExportHelper): 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', - ) global_scale = FloatProperty( name="Scale", min=0.01, max=1000.0, diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py index 785bfb34..884fc11d 100644 --- a/io_mesh_stl/__init__.py +++ b/io_mesh_stl/__init__.py @@ -21,8 +21,8 @@ bl_info = { "name": "STL format", "author": "Guillaume Bouchard (Guillaum)", - "version": (1, 0), - "blender": (2, 57, 0), + "version": (1, 1), + "blender": (2, 73, 0), "location": "File > Import-Export > Stl", "description": "Import-Export STL files", "warning": "", @@ -65,12 +65,13 @@ from bpy.props import (StringProperty, ) from bpy_extras.io_utils import (ImportHelper, ExportHelper, + IOHelperOrientation, axis_conversion, ) from bpy.types import Operator, OperatorFileListElement -class ImportSTL(Operator, ImportHelper): +class ImportSTL(Operator, ImportHelper, IOHelperOrientation): """Load STL triangle mesh data""" bl_idname = "import_mesh.stl" bl_label = "Import STL" @@ -90,28 +91,6 @@ class ImportSTL(Operator, ImportHelper): subtype='DIR_PATH', ) - 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', - ) global_scale = FloatProperty( name="Scale", min=0.01, max=1000.0, @@ -160,7 +139,7 @@ class ImportSTL(Operator, ImportHelper): return {'FINISHED'} -class ExportSTL(Operator, ExportHelper): +class ExportSTL(Operator, ExportHelper, IOHelperOrientation): """Save STL triangle mesh data from the active object""" bl_idname = "export_mesh.stl" bl_label = "Export STL" @@ -168,28 +147,6 @@ class ExportSTL(Operator, ExportHelper): filename_ext = ".stl" filter_glob = StringProperty(default="*.stl", options={'HIDDEN'}) - 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', - ) global_scale = FloatProperty( name="Scale", min=0.01, max=1000.0, 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 diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 238d536e..f5c129e4 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,8 +21,8 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 2, 0), - "blender": (2, 72, 0), + "version": (3, 2, 1), + "blender": (2, 73, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, " "textures, cameras, lamps and actions", @@ -53,12 +53,13 @@ from bpy.props import (StringProperty, from bpy_extras.io_utils import (ImportHelper, ExportHelper, + IOHelperOrientation, path_reference_mode, axis_conversion, ) -class ImportFBX(bpy.types.Operator, ImportHelper): +class ImportFBX(bpy.types.Operator, ImportHelper, IOHelperOrientation): """Load a FBX file""" bl_idname = "import_scene.fbx" bl_label = "Import FBX" @@ -74,28 +75,6 @@ class ImportFBX(bpy.types.Operator, ImportHelper): description="Specify orientation and scale, instead of using embedded data in FBX file", 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.001, max=1000.0, @@ -221,7 +200,7 @@ class ImportFBX(bpy.types.Operator, ImportHelper): return import_fbx.load(self, context, **keywords) -class ExportFBX(bpy.types.Operator, ExportHelper): +class ExportFBX(bpy.types.Operator, ExportHelper, IOHelperOrientation): """Write a FBX file""" bl_idname = "export_scene.fbx" bl_label = "Export FBX" @@ -253,28 +232,6 @@ class ExportFBX(bpy.types.Operator, ExportHelper): soft_min=0.01, soft_max=1000.0, default=1.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', - ) # 7.4 only bake_space_transform = BoolProperty( name="Apply Transform", 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, diff --git a/io_scene_vrml2/__init__.py b/io_scene_vrml2/__init__.py index befc5101..6bbf7862 100644 --- a/io_scene_vrml2/__init__.py +++ b/io_scene_vrml2/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "VRML2 (Virtual Reality Modeling Language)", "author": "Campbell Barton", - "blender": (2, 66, 0), + "blender": (2, 73, 0), "location": "File > Export", "description": "Exports mesh objects to VRML2, supporting vertex and material colors", "warning": "", @@ -45,13 +45,13 @@ from bpy.props import (CollectionProperty, FloatProperty, ) from bpy_extras.io_utils import (ExportHelper, + IOHelperOrientation, path_reference_mode, axis_conversion, ) -class ExportVRML(bpy.types.Operator, ExportHelper): - """Export mesh objects as a VRML2, """ \ - """colors and texture coordinates""" +class ExportVRML(bpy.types.Operator, ExportHelper, IOHelperOrientation): + """Export mesh objects as a VRML2, colors and texture coordinates""" bl_idname = "export_scene.vrml2" bl_label = "Export VRML2" @@ -86,28 +86,6 @@ class ExportVRML(bpy.types.Operator, ExportHelper): 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='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, diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py index 7bda64ab..2443c28c 100644 --- a/io_scene_x3d/__init__.py +++ b/io_scene_x3d/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "Web3D X3D/VRML2 format", "author": "Campbell Barton, Bart", - "blender": (2, 57, 0), + "blender": (2, 73, 0), "location": "File > Import-Export", "description": "Import-Export X3D, Import VRML2", "warning": "", @@ -41,12 +41,13 @@ import bpy from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatProperty from bpy_extras.io_utils import (ImportHelper, ExportHelper, + IOHelperOrientation, axis_conversion, path_reference_mode, ) -class ImportX3D(bpy.types.Operator, ImportHelper): +class ImportX3D(bpy.types.Operator, ImportHelper, IOHelperOrientation): """Import an X3D or VRML2 file""" bl_idname = "import_scene.x3d" bl_label = "Import X3D/VRML2" @@ -55,30 +56,6 @@ class ImportX3D(bpy.types.Operator, ImportHelper): filename_ext = ".x3d" filter_glob = StringProperty(default="*.x3d;*.wrl", options={'HIDDEN'}) - 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): from . import import_x3d @@ -94,7 +71,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper): return import_x3d.load(self, context, **keywords) -class ExportX3D(bpy.types.Operator, ExportHelper): +class ExportX3D(bpy.types.Operator, ExportHelper, IOHelperOrientation): """Export selection to Extensible 3D file (.x3d)""" bl_idname = "export_scene.x3d" bl_label = 'Export X3D' @@ -145,28 +122,6 @@ class ExportX3D(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, |