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

WIP: GLTF: Use layout panels instead of PanelTypes #105239

Closed
Jesse Yurkovich wants to merge 1 commits from deadpin:panels-gltf into main
pull from: deadpin:panels-gltf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 2 +264 -726
2 changed files with 264 additions and 726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

913
io_scene_gltf2/__init__.py
View File

File diff suppressed because it is too large Load Diff

39
io_scene_gltf2/blender/com/gltf2_blender_ui.py
View File

@ -553,35 +553,19 @@ class SCENE_UL_gltf2_filter_action(bpy.types.UIList):
elif self.layout_type in {'GRID'}: elif self.layout_type in {'GRID'}:
layout.alignment = 'CENTER' layout.alignment = 'CENTER'
class SCENE_PT_gltf2_action_filter(bpy.types.Panel):
bl_space_type = 'FILE_BROWSER'
bl_region_type = 'TOOL_PROPS'
bl_label = "Action Filter"
bl_parent_id = "GLTF_PT_export_animation"
bl_options = {'DEFAULT_CLOSED'}
@classmethod def export_panel_animation_action_filter(layout, operator):
def poll(self, context): if operator.export_animation_mode not in ["ACTIONS", "ACTIVE_ACTIONS", "BROADCAST"]:
sfile = context.space_data
operator = sfile.active_operator
return operator.export_animation_mode in ["ACTIONS", "ACTIVE_ACTIONS", "BROADCAST"]
def draw_header(self, context):
sfile = context.space_data
operator = sfile.active_operator
self.layout.prop(operator, "export_action_filter", text="")
def draw(self, context):
layout = self.layout
row = layout.row()
sfile = context.space_data
operator = sfile.active_operator
if operator.export_action_filter is False:
return return
layout.active = operator.export_animations and operator.export_action_filter header, body = layout.panel("GLTF_export_action_filter", default_closed=True)
header.use_property_split = False
header.prop(operator, "export_action_filter", text="")
header.label(text="Action Filter")
if body and operator.export_action_filter:
body.active = operator.export_animations and operator.export_action_filter
row = body.row()
if len(bpy.data.actions) > 0: if len(bpy.data.actions) > 0:
row.template_list("SCENE_UL_gltf2_filter_action", "", bpy.data.scenes[0], "gltf_action_filter", bpy.data.scenes[0], "gltf_action_filter_active") row.template_list("SCENE_UL_gltf2_filter_action", "", bpy.data.scenes[0], "gltf_action_filter", bpy.data.scenes[0], "gltf_action_filter_active")
@ -591,6 +575,7 @@ class SCENE_PT_gltf2_action_filter(bpy.types.Panel):
else: else:
row.label(text="No Actions in .blend file") row.label(text="No Actions in .blend file")
############################################################################### ###############################################################################
def register(): def register():
@ -598,7 +583,6 @@ def register():
bpy.types.NODE_MT_category_shader_output.append(add_gltf_settings_to_menu) bpy.types.NODE_MT_category_shader_output.append(add_gltf_settings_to_menu)
bpy.utils.register_class(SCENE_OT_gltf2_action_filter_refresh) bpy.utils.register_class(SCENE_OT_gltf2_action_filter_refresh)
bpy.utils.register_class(SCENE_UL_gltf2_filter_action) bpy.utils.register_class(SCENE_UL_gltf2_filter_action)
bpy.utils.register_class(SCENE_PT_gltf2_action_filter)
def variant_register(): def variant_register():
bpy.utils.register_class(SCENE_OT_gltf2_display_variant) bpy.utils.register_class(SCENE_OT_gltf2_display_variant)
@ -626,7 +610,6 @@ def variant_register():
def unregister(): def unregister():
bpy.utils.unregister_class(NODE_OT_GLTF_SETTINGS) bpy.utils.unregister_class(NODE_OT_GLTF_SETTINGS)
bpy.utils.unregister_class(SCENE_PT_gltf2_action_filter)
bpy.utils.unregister_class(SCENE_UL_gltf2_filter_action) bpy.utils.unregister_class(SCENE_UL_gltf2_filter_action)
bpy.utils.unregister_class(SCENE_OT_gltf2_action_filter_refresh) bpy.utils.unregister_class(SCENE_OT_gltf2_action_filter_refresh)