Skip to content
Snippets Groups Projects
Commit d8f7f124 authored by Campbell Barton's avatar Campbell Barton
Browse files

rename axis conversion operators settings.

parent e41ec5e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
io_scene_3ds/__init__.py
+ 8
− 8
View file @ d8f7f124
...@@ -58,7 +58,7 @@ class Import3DS(bpy.types.Operator, ImportHelper): ...@@ -58,7 +58,7 @@ class Import3DS(bpy.types.Operator, ImportHelper):
use_image_search = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True) use_image_search = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True)
use_apply_transform = BoolProperty(name="Apply Transform", description="Workaround for object transformations importing incorrectly", default=True) use_apply_transform = BoolProperty(name="Apply Transform", description="Workaround for object transformations importing incorrectly", default=True)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -70,7 +70,7 @@ class Import3DS(bpy.types.Operator, ImportHelper): ...@@ -70,7 +70,7 @@ class Import3DS(bpy.types.Operator, ImportHelper):
default='Y', default='Y',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -85,9 +85,9 @@ class Import3DS(bpy.types.Operator, ImportHelper): ...@@ -85,9 +85,9 @@ class Import3DS(bpy.types.Operator, ImportHelper):
def execute(self, context): def execute(self, context):
from . import import_3ds from . import import_3ds
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "filter_glob")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "filter_glob"))
global_matrix = axis_conversion(from_forward=self.global_axis_forward, from_up=self.global_axis_up).to_4x4() global_matrix = axis_conversion(from_forward=self.axis_forward, from_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return import_3ds.load(self, context, **keywords) return import_3ds.load(self, context, **keywords)
...@@ -103,7 +103,7 @@ class Export3DS(bpy.types.Operator, ExportHelper): ...@@ -103,7 +103,7 @@ class Export3DS(bpy.types.Operator, ExportHelper):
use_selection = BoolProperty(name="Selection Only", description="Export selected objects only", default=False) use_selection = BoolProperty(name="Selection Only", description="Export selected objects only", default=False)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -115,7 +115,7 @@ class Export3DS(bpy.types.Operator, ExportHelper): ...@@ -115,7 +115,7 @@ class Export3DS(bpy.types.Operator, ExportHelper):
default='Y', default='Y',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -130,8 +130,8 @@ class Export3DS(bpy.types.Operator, ExportHelper): ...@@ -130,8 +130,8 @@ class Export3DS(bpy.types.Operator, ExportHelper):
def execute(self, context): def execute(self, context):
from . import export_3ds from . import export_3ds
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "filter_glob", "check_existing")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "filter_glob", "check_existing"))
global_matrix = axis_conversion(to_forward=self.global_axis_forward, to_up=self.global_axis_up).to_4x4() global_matrix = axis_conversion(to_forward=self.axis_forward, to_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return export_3ds.save(self, context, **keywords) return export_3ds.save(self, context, **keywords)
......
io_scene_fbx/__init__.py
+ 4
− 4
View file @ d8f7f124
...@@ -60,7 +60,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper): ...@@ -60,7 +60,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
# EXP_OBS_SCENE = BoolProperty(name="Scene Objects", description="Export all objects in this scene", default=True) # EXP_OBS_SCENE = BoolProperty(name="Scene Objects", description="Export all objects in this scene", default=True)
global_scale = FloatProperty(name="Scale", description="Scale all data, (Note! some imports dont support scaled armatures)", min=0.01, max=1000.0, soft_min=0.01, soft_max=1000.0, default=1.0) global_scale = FloatProperty(name="Scale", description="Scale all data, (Note! some imports dont support scaled armatures)", min=0.01, max=1000.0, soft_min=0.01, soft_max=1000.0, default=1.0)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -72,7 +72,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper): ...@@ -72,7 +72,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
default='Y', default='Y',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -140,9 +140,9 @@ class ExportFBX(bpy.types.Operator, ExportHelper): ...@@ -140,9 +140,9 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
global_matrix = Matrix() global_matrix = Matrix()
global_matrix[0][0] = global_matrix[1][1] = global_matrix[2][2] = self.global_scale global_matrix[0][0] = global_matrix[1][1] = global_matrix[2][2] = self.global_scale
global_matrix = global_matrix * axis_conversion(to_forward=self.global_axis_forward, to_up=self.global_axis_up).to_4x4() global_matrix = global_matrix * axis_conversion(to_forward=self.axis_forward, to_up=self.axis_up).to_4x4()
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "global_scale", "check_existing", "filter_glob")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "global_scale", "check_existing", "filter_glob"))
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
from . import export_fbx from . import export_fbx
......
io_scene_obj/__init__.py
+ 10
− 10
View file @ d8f7f124
...@@ -74,7 +74,7 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): ...@@ -74,7 +74,7 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
) )
global_clamp_size = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) global_clamp_size = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -86,7 +86,7 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): ...@@ -86,7 +86,7 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
default='-Z', default='-Z',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -112,9 +112,9 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): ...@@ -112,9 +112,9 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
else: else:
self.use_groups_as_vgroups = False self.use_groups_as_vgroups = False
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "filter_glob", "split_mode")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "filter_glob", "split_mode"))
global_matrix = axis_conversion(from_forward=self.global_axis_forward, from_up=self.global_axis_up).to_4x4() global_matrix = axis_conversion(from_forward=self.axis_forward, from_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return import_obj.load(self, context, **keywords) return import_obj.load(self, context, **keywords)
...@@ -142,8 +142,8 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): ...@@ -142,8 +142,8 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
row = layout.split(percentage=0.67) row = layout.split(percentage=0.67)
row.prop(self, "global_clamp_size") row.prop(self, "global_clamp_size")
layout.prop(self, "global_axis_forward") layout.prop(self, "axis_forward")
layout.prop(self, "global_axis_up") layout.prop(self, "axis_up")
layout.prop(self, "use_image_search") layout.prop(self, "use_image_search")
...@@ -188,7 +188,7 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): ...@@ -188,7 +188,7 @@ class ExportOBJ(bpy.types.Operator, ExportHelper):
global_scale = FloatProperty(name="Scale", description="Scale all data, (Note! some imports dont support scaled armatures)", min=0.01, max=1000.0, soft_min=0.01, soft_max=1000.0, default=1.0) global_scale = FloatProperty(name="Scale", description="Scale all data, (Note! some imports dont support scaled armatures)", min=0.01, max=1000.0, soft_min=0.01, soft_max=1000.0, default=1.0)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -200,7 +200,7 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): ...@@ -200,7 +200,7 @@ class ExportOBJ(bpy.types.Operator, ExportHelper):
default='-Z', default='-Z',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -218,11 +218,11 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): ...@@ -218,11 +218,11 @@ class ExportOBJ(bpy.types.Operator, ExportHelper):
from . import export_obj from . import export_obj
from mathutils import Matrix from mathutils import Matrix
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "global_scale", "check_existing", "filter_glob")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "global_scale", "check_existing", "filter_glob"))
global_matrix = Matrix() global_matrix = Matrix()
global_matrix[0][0] = global_matrix[1][1] = global_matrix[2][2] = self.global_scale global_matrix[0][0] = global_matrix[1][1] = global_matrix[2][2] = self.global_scale
global_matrix = global_matrix * axis_conversion(to_forward=self.global_axis_forward, to_up=self.global_axis_up).to_4x4() global_matrix = global_matrix * axis_conversion(to_forward=self.axis_forward, to_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return export_obj.save(self, context, **keywords) return export_obj.save(self, context, **keywords)
......
io_scene_x3d/__init__.py
+ 8
− 8
View file @ d8f7f124
...@@ -52,7 +52,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper): ...@@ -52,7 +52,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper):
filename_ext = ".x3d" filename_ext = ".x3d"
filter_glob = StringProperty(default="*.x3d;*.wrl", options={'HIDDEN'}) filter_glob = StringProperty(default="*.x3d;*.wrl", options={'HIDDEN'})
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -64,7 +64,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper): ...@@ -64,7 +64,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper):
default='Z', default='Z',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -79,8 +79,8 @@ class ImportX3D(bpy.types.Operator, ImportHelper): ...@@ -79,8 +79,8 @@ class ImportX3D(bpy.types.Operator, ImportHelper):
def execute(self, context): def execute(self, context):
from . import import_x3d from . import import_x3d
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "filter_glob")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "filter_glob"))
global_matrix = axis_conversion(from_forward=self.global_axis_forward, from_up=self.global_axis_up).to_4x4() global_matrix = axis_conversion(from_forward=self.axis_forward, from_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return import_x3d.load(self, context, **keywords) return import_x3d.load(self, context, **keywords)
...@@ -99,7 +99,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper): ...@@ -99,7 +99,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper):
use_triangulate = BoolProperty(name="Triangulate", description="Triangulate quads.", default=False) use_triangulate = BoolProperty(name="Triangulate", description="Triangulate quads.", default=False)
use_compress = BoolProperty(name="Compress", description="GZip the resulting file, requires a full python install", default=False) use_compress = BoolProperty(name="Compress", description="GZip the resulting file, requires a full python install", default=False)
global_axis_forward = EnumProperty( axis_forward = EnumProperty(
name="Forward", name="Forward",
items=(('X', "X Forward", ""), items=(('X', "X Forward", ""),
('Y', "Y Forward", ""), ('Y', "Y Forward", ""),
...@@ -111,7 +111,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper): ...@@ -111,7 +111,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper):
default='Z', default='Z',
) )
global_axis_up = EnumProperty( axis_up = EnumProperty(
name="Up", name="Up",
items=(('X', "X Up", ""), items=(('X', "X Up", ""),
('Y', "Y Up", ""), ('Y', "Y Up", ""),
...@@ -127,8 +127,8 @@ class ExportX3D(bpy.types.Operator, ExportHelper): ...@@ -127,8 +127,8 @@ class ExportX3D(bpy.types.Operator, ExportHelper):
from . import export_x3d from . import export_x3d
from mathutils import Matrix from mathutils import Matrix
keywords = self.as_keywords(ignore=("global_axis_forward", "global_axis_up", "check_existing", "filter_glob")) keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "check_existing", "filter_glob"))
global_matrix = axis_conversion(to_forward=self.global_axis_forward, to_up=self.global_axis_up).to_4x4() global_matrix = axis_conversion(to_forward=self.axis_forward, to_up=self.axis_up).to_4x4()
keywords["global_matrix"] = global_matrix keywords["global_matrix"] = global_matrix
return export_x3d.save(self, context, **keywords) return export_x3d.save(self, context, **keywords)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment