blender/blender-addons
19
43
Fork 96
Code Issues 631 Pull Requests 27 Projects 1 Releases Wiki Activity

FBX: Use layout panels instead of PanelTypes #105238

Merged
Jesse Yurkovich merged 3 commits from deadpin/blender-addons:panels-fbx into main 2024-04-04 20:52:53 +02:00
Conversation 2 Commits 3 Files Changed 1 +128 -327
1 changed files with 128 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d934140c0 - Show all commits

455
io_scene_fbx/__init__.py
View File

@ -193,7 +193,15 @@ class ImportFBX(bpy.types.Operator, ImportHelper):
) )
def draw(self, context): def draw(self, context):
pass operator = self
layout = self.layout
Mysteryem marked this conversation as resolved
Thomas Barlow commented 2024-04-03 14:54:59 +02:00
Review
Copy Link

Now that self is an Operator rather than a Panel, the operator variable can be replaced with using self.

Same case in ExportFBX.draw()

Now that `self` is an `Operator` rather than a `Panel`, the `operator` variable can be replaced with using `self`. Same case in `ExportFBX.draw()`
layout.use_property_split = True
layout.use_property_decorate = False # No animation.
import_panel_include(layout, operator)
import_panel_transform(layout, operator)
import_panel_animation(layout, operator)
import_panel_armature(layout, operator)
def execute(self, context): def execute(self, context):
keywords = self.as_keywords(ignore=("filter_glob", "directory", "ui_tab", "filepath", "files")) keywords = self.as_keywords(ignore=("filter_glob", "directory", "ui_tab", "filepath", "files"))
@ -213,158 +221,65 @@ class ImportFBX(bpy.types.Operator, ImportHelper):
return import_fbx.load(self, context, filepath=self.filepath, **keywords) return import_fbx.load(self, context, filepath=self.filepath, **keywords)
class FBX_PT_import_include(bpy.types.Panel): def import_panel_include(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_import_include", default_closed=False)
bl_region_type = 'TOOL_PROPS' header.label(text="Include")
bl_label = "Include" if body:
bl_parent_id = "FILE_PT_operator" body.prop(operator, "use_custom_normals")
body.prop(operator, "use_subsurf")
@classmethod body.prop(operator, "use_custom_props")
def poll(cls, context): sub = body.row()
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.enabled = operator.use_custom_props
sub.prop(operator, "use_custom_props_enum_as_string") sub.prop(operator, "use_custom_props_enum_as_string")
layout.prop(operator, "use_image_search") body.prop(operator, "use_image_search")
layout.prop(operator, "colors_type") body.prop(operator, "colors_type")
class FBX_PT_import_transform(bpy.types.Panel): def import_panel_transform(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_import_transform", default_closed=False)
bl_region_type = 'TOOL_PROPS' header.label(text="Transform")
bl_label = "Transform" if body:
bl_parent_id = "FILE_PT_operator" body.prop(operator, "global_scale")
body.prop(operator, "decal_offset")
@classmethod row = body.row()
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")
row = layout.row()
row.prop(operator, "bake_space_transform") row.prop(operator, "bake_space_transform")
row.label(text="", icon='ERROR') row.label(text="", icon='ERROR')
layout.prop(operator, "use_prepost_rot") body.prop(operator, "use_prepost_rot")
import_panel_transform_orientation(body, operator)
class FBX_PT_import_transform_manual_orientation(bpy.types.Panel): def import_panel_transform_orientation(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_import_transform_manual_orientation", default_closed=False)
bl_region_type = 'TOOL_PROPS' header.use_property_split = False
bl_label = "Manual Orientation" header.prop(operator, "use_manual_orientation", text="")
bl_parent_id = "FBX_PT_import_transform" header.label(text="Manual Orientation")
if body:
@classmethod body.enabled = operator.use_manual_orientation
def poll(cls, context): body.prop(operator, "axis_forward")
sfile = context.space_data body.prop(operator, "axis_up")
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 import_panel_animation(layout, operator):
def poll(cls, context): header, body = layout.panel("FBX_import_animation", default_closed=True)
sfile = context.space_data header.use_property_split = False
operator = sfile.active_operator header.prop(operator, "use_anim", text="")
header.label(text="Animation")
return operator.bl_idname == "IMPORT_SCENE_OT_fbx" if body:
body.enabled = operator.use_anim
def draw_header(self, context): body.prop(operator, "anim_offset")
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 import_panel_armature(layout, operator):
def poll(cls, context): header, body = layout.panel("FBX_import_armature", default_closed=True)
sfile = context.space_data header.label(text="Armature")
operator = sfile.active_operator if body:
body.prop(operator, "ignore_leaf_bones")
return operator.bl_idname == "IMPORT_SCENE_OT_fbx" body.prop(operator, "force_connect_children"),
body.prop(operator, "automatic_bone_orientation"),
def draw(self, context): sub = body.column()
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.enabled = not operator.automatic_bone_orientation
sub.prop(operator, "primary_bone_axis") sub.prop(operator, "primary_bone_axis")
sub.prop(operator, "secondary_bone_axis") sub.prop(operator, "secondary_bone_axis")
@ -636,7 +551,17 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
) )
def draw(self, context): def draw(self, context):
pass operator = self
layout = self.layout
layout.use_property_split = True
layout.use_property_decorate = False # No animation.
export_main(layout, operator)
export_panel_include(layout, operator)
export_panel_transform(layout, operator)
export_panel_geometry(layout, operator)
export_panel_armature(layout, operator)
export_panel_animation(layout, operator)
@property @property
def check_extension(self): def check_extension(self):
@ -663,205 +588,92 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
return export_fbx_bin.save(self, context, **keywords) return export_fbx_bin.save(self, context, **keywords)
class FBX_PT_export_main(bpy.types.Panel): def export_main(layout, operator):
bl_space_type = 'FILE_BROWSER' row = layout.row(align=True)
bl_region_type = 'TOOL_PROPS' row.prop(operator, "path_mode")
bl_label = "" sub = row.row(align=True)
bl_parent_id = "FILE_PT_operator" sub.enabled = (operator.path_mode == 'COPY')
bl_options = {'HIDE_HEADER'} sub.prop(operator, "embed_textures", text="", icon='PACKAGE' if operator.embed_textures else 'UGLYPACKAGE')
row = layout.row(align=True)
@classmethod row.prop(operator, "batch_mode")
def poll(cls, context): sub = row.row(align=True)
sfile = context.space_data sub.prop(operator, "use_batch_own_dir", text="", icon='NEWFOLDER')
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): def export_panel_include(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_export_include", default_closed=False)
bl_region_type = 'TOOL_PROPS' header.label(text="Include")
bl_label = "Include" if body:
bl_parent_id = "FILE_PT_operator" sublayout = body.column(heading="Limit to")
@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
sublayout = layout.column(heading="Limit to")
sublayout.enabled = (operator.batch_mode == 'OFF') sublayout.enabled = (operator.batch_mode == 'OFF')
sublayout.prop(operator, "use_selection") sublayout.prop(operator, "use_selection")
sublayout.prop(operator, "use_visible") sublayout.prop(operator, "use_visible")
sublayout.prop(operator, "use_active_collection") sublayout.prop(operator, "use_active_collection")
layout.column().prop(operator, "object_types") body.column().prop(operator, "object_types")
layout.prop(operator, "use_custom_props") body.prop(operator, "use_custom_props")
class FBX_PT_export_transform(bpy.types.Panel): def export_panel_transform(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_export_transform", default_closed=False)
bl_region_type = 'TOOL_PROPS' header.label(text="Transform")
bl_label = "Transform" if body:
bl_parent_id = "FILE_PT_operator" body.prop(operator, "global_scale")
body.prop(operator, "apply_scale_options")
@classmethod body.prop(operator, "axis_forward")
def poll(cls, context): body.prop(operator, "axis_up")
sfile = context.space_data
operator = sfile.active_operator
return operator.bl_idname == "EXPORT_SCENE_OT_fbx" body.prop(operator, "apply_unit_scale")
body.prop(operator, "use_space_transform")
def draw(self, context): row = body.row()
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, "use_space_transform")
row = layout.row()
row.prop(operator, "bake_space_transform") row.prop(operator, "bake_space_transform")
row.label(text="", icon='ERROR') row.label(text="", icon='ERROR')
class FBX_PT_export_geometry(bpy.types.Panel): def export_panel_geometry(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_export_geometry", default_closed=True)
bl_region_type = 'TOOL_PROPS' header.label(text="Geometry")
bl_label = "Geometry" if body:
bl_parent_id = "FILE_PT_operator" body.prop(operator, "mesh_smooth_type")
bl_options = {'DEFAULT_CLOSED'} body.prop(operator, "use_subsurf")
body.prop(operator, "use_mesh_modifiers")
@classmethod #sub = body.row()
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.enabled = operator.use_mesh_modifiers and False # disabled in 2.8...
#sub.prop(operator, "use_mesh_modifiers_render") #sub.prop(operator, "use_mesh_modifiers_render")
layout.prop(operator, "use_mesh_edges") body.prop(operator, "use_mesh_edges")
layout.prop(operator, "use_triangles") body.prop(operator, "use_triangles")
sub = layout.row() sub = body.row()
#~ sub.enabled = operator.mesh_smooth_type in {'OFF'} #~ sub.enabled = operator.mesh_smooth_type in {'OFF'}
sub.prop(operator, "use_tspace") sub.prop(operator, "use_tspace")
layout.prop(operator, "colors_type") body.prop(operator, "colors_type")
layout.prop(operator, "prioritize_active_color") body.prop(operator, "prioritize_active_color")
class FBX_PT_export_armature(bpy.types.Panel): def export_panel_armature(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_export_armature", default_closed=True)
bl_region_type = 'TOOL_PROPS' header.label(text="Armature")
bl_label = "Armature" if body:
bl_parent_id = "FILE_PT_operator" body.prop(operator, "primary_bone_axis")
bl_options = {'DEFAULT_CLOSED'} body.prop(operator, "secondary_bone_axis")
body.prop(operator, "armature_nodetype")
@classmethod body.prop(operator, "use_armature_deform_only")
def poll(cls, context): body.prop(operator, "add_leaf_bones")
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, "primary_bone_axis")
layout.prop(operator, "secondary_bone_axis")
layout.prop(operator, "armature_nodetype")
layout.prop(operator, "use_armature_deform_only")
layout.prop(operator, "add_leaf_bones")
class FBX_PT_export_bake_animation(bpy.types.Panel): def export_panel_animation(layout, operator):
bl_space_type = 'FILE_BROWSER' header, body = layout.panel("FBX_export_bake_animation", default_closed=True)
bl_region_type = 'TOOL_PROPS' header.use_property_split = False
bl_label = "Bake Animation" header.prop(operator, "bake_anim", text="")
bl_parent_id = "FILE_PT_operator" header.label(text="Animation")
bl_options = {'DEFAULT_CLOSED'} if body:
body.enabled = operator.bake_anim
@classmethod body.prop(operator, "bake_anim_use_all_bones")
def poll(cls, context): body.prop(operator, "bake_anim_use_nla_strips")
sfile = context.space_data body.prop(operator, "bake_anim_use_all_actions")
operator = sfile.active_operator body.prop(operator, "bake_anim_force_startend_keying")
body.prop(operator, "bake_anim_step")
return operator.bl_idname == "EXPORT_SCENE_OT_fbx" body.prop(operator, "bake_anim_simplify_factor")
def draw_header(self, context):
sfile = context.space_data
operator = sfile.active_operator
self.layout.prop(operator, "bake_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.bake_anim
layout.prop(operator, "bake_anim_use_all_bones")
layout.prop(operator, "bake_anim_use_nla_strips")
layout.prop(operator, "bake_anim_use_all_actions")
layout.prop(operator, "bake_anim_force_startend_keying")
layout.prop(operator, "bake_anim_step")
layout.prop(operator, "bake_anim_simplify_factor")
def menu_func_import(self, context): def menu_func_import(self, context):
@ -874,18 +686,7 @@ def menu_func_export(self, context):
classes = ( classes = (
ImportFBX, ImportFBX,
FBX_PT_import_include,
FBX_PT_import_transform,
FBX_PT_import_transform_manual_orientation,
FBX_PT_import_animation,
FBX_PT_import_armature,
ExportFBX, ExportFBX,
FBX_PT_export_main,
FBX_PT_export_include,
FBX_PT_export_transform,
FBX_PT_export_geometry,
FBX_PT_export_armature,
FBX_PT_export_bake_animation,
) )