[Bf-extensions-cvs] [e653d29b] filebrowser_redesign: Merge commit 'f1dd37b8ac8f2db93f56002bae24e70b2cbf986f' into filebrowser_redesign
Julian Eisel
noreply at git.blender.org
Mon Sep 2 15:57:47 CEST 2019
Commit: e653d29b9a2e8c2e143a34e556101012e88fe927
Author: Julian Eisel
Date: Mon Sep 2 15:57:07 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBAe653d29b9a2e8c2e143a34e556101012e88fe927
Merge commit 'f1dd37b8ac8f2db93f56002bae24e70b2cbf986f' into filebrowser_redesign
===================================================================
===================================================================
diff --cc io_scene_fbx/__init__.py
index 4c0e911c,ebbf2a19..249cb0d2
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@@ -197,159 -239,6 +203,160 @@@ class ImportFBX(bpy.types.Operator, Imp
return import_fbx.load(self, context, **keywords)
+class FBX_PT_import_include(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Include"
+ bl_parent_id = "FILE_PT_operator"
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "IMPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "use_custom_normals")
++ layout.prop(operator, "use_subsurf")
+ layout.prop(operator, "use_custom_props")
+ sub = layout.row()
+ sub.enabled = operator.use_custom_props
+ sub.prop(operator, "use_custom_props_enum_as_string")
+ layout.prop(operator, "use_image_search")
+
+
+class FBX_PT_import_transform(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Transform"
+ bl_parent_id = "FILE_PT_operator"
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "IMPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "global_scale")
+ layout.prop(operator, "decal_offset")
+ layout.prop(operator, "bake_space_transform")
+ layout.prop(operator, "use_prepost_rot")
+
+
+class FBX_PT_import_transform_manual_orientation(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Manual Orientation"
+ bl_parent_id = "FBX_PT_import_transform"
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "IMPORT_SCENE_OT_fbx"
+
+ def draw_header(self, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ self.layout.prop(operator, "use_manual_orientation", text="")
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.enabled = operator.use_manual_orientation
+
+ layout.prop(operator, "axis_forward")
+ layout.prop(operator, "axis_up")
+
+
+class FBX_PT_import_animation(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Animation"
+ bl_parent_id = "FILE_PT_operator"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "IMPORT_SCENE_OT_fbx"
+
+ def draw_header(self, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ self.layout.prop(operator, "use_anim", text="")
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.enabled = operator.use_anim
+
+ layout.prop(operator, "anim_offset")
+
+
+class FBX_PT_import_armature(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Armature"
+ bl_parent_id = "FILE_PT_operator"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "IMPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "ignore_leaf_bones")
+ layout.prop(operator, "force_connect_children"),
+ layout.prop(operator, "automatic_bone_orientation"),
+ sub = layout.column()
+ sub.enabled = not operator.automatic_bone_orientation
+ sub.prop(operator, "primary_bone_axis")
+ sub.prop(operator, "secondary_bone_axis")
+
+
@orientation_helper(axis_forward='-Z', axis_up='Y')
class ExportFBX(bpy.types.Operator, ExportHelper):
"""Write a FBX file"""
@@@ -577,199 -482,66 +590,200 @@@
options={'HIDDEN'},
)
+ def draw(self, context):
+ pass
+
+
+class FBX_PT_export_main(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = ""
+ bl_parent_id = "FILE_PT_operator"
+ bl_options = {'HIDE_HEADER'}
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "EXPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ row = layout.row(align=True)
+ row.prop(operator, "path_mode")
+ sub = row.row(align=True)
+ sub.enabled = (operator.path_mode == 'COPY')
+ sub.prop(operator, "embed_textures", text="", icon='PACKAGE' if operator.embed_textures else 'UGLYPACKAGE')
+ row = layout.row(align=True)
+ row.prop(operator, "batch_mode")
+ sub = row.row(align=True)
+ sub.prop(operator, "use_batch_own_dir", text="", icon='NEWFOLDER')
+
+
+class FBX_PT_export_include(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Include"
+ bl_parent_id = "FILE_PT_operator"
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "EXPORT_SCENE_OT_fbx"
+
def draw(self, context):
layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "use_selection")
+ layout.prop(operator, "use_active_collection")
+ layout.column().prop(operator, "object_types")
+ layout.prop(operator, "use_custom_props")
+
+
+class FBX_PT_export_transform(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Transform"
+ bl_parent_id = "FILE_PT_operator"
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "EXPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "global_scale")
+ layout.prop(operator, "apply_scale_options")
+
+ layout.prop(operator, "axis_forward")
+ layout.prop(operator, "axis_up")
+
+ layout.prop(operator, "apply_unit_scale")
+ layout.prop(operator, "bake_space_transform")
+
+
+class FBX_PT_export_geometry(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Geometry"
+ bl_parent_id = "FILE_PT_operator"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "EXPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ layout.prop(operator, "mesh_smooth_type")
++ layout.prop(operator, "use_subsurf")
+ layout.prop(operator, "use_mesh_modifiers")
+ #sub = layout.row()
+ #sub.enabled = operator.use_mesh_modifiers and False # disabled in 2.8...
+ #sub.prop(operator, "use_mesh_modifiers_render")
+ layout.prop(operator, "use_mesh_edges")
+ sub = layout.row()
+ #~ sub.enabled = operator.mesh_smooth_type in {'OFF'}
+ sub.prop(operator, "use_tspace")
+
+
+class FBX_PT_export_armature(bpy.types.Panel):
+ bl_space_type = 'FILE_BROWSER'
+ bl_region_type = 'TOOL_PROPS'
+ bl_label = "Armature"
+ bl_parent_id = "FILE_PT_operator"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ sfile = context.space_data
+ operator = sfile.active_operator
+
+ return operator.bl_idname == "EXPORT_SCENE_OT_fbx"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No anima
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list