Merge branch 'main' into PoseMode

ui/optimization.py

@@ -17,7 +17,7 @@ class AvatarToolkit_PT_OptimizationPanel(bpy.types.Panel):
     bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
     bl_order = 2
 
-    def draw(self, context):
+    def draw(self: bpy.types.Panel, context: bpy.types.Context):
         layout = self.layout
         armature = get_selected_armature(context)
         

ui/panel.py

@@ -2,6 +2,12 @@ import bpy
 from ..core.register import register_wrap
 from ..functions.translations import t
 
+def draw_title(self: bpy.types.Panel):
+    layout = self.layout
+    layout.label(text=t("AvatarToolkit.welcome"))
+    layout.label(text=t("AvatarToolkit.description"))
+    layout.label(text=t("AvatarToolkit.alpha_warning"))
+
 CATEGORY_NAME = "Avatar Toolkit"
 
 @register_wrap
@@ -12,10 +18,7 @@ class AvatarToolKit_PT_AvatarToolkitPanel(bpy.types.Panel):
     bl_region_type = 'UI'
     bl_category = CATEGORY_NAME
 
-    def draw(self, context):
-        layout = self.layout
-        layout.label(text=t("AvatarToolkit.welcome"))
-        layout.label(text=t("AvatarToolkit.description"))
-        layout.label(text=t("AvatarToolkit.alpha_warning"))
+    def draw(self: bpy.types.Panel, context: bpy.types.Context):
+        draw_title(self)
 
         

ui/tools.py

@@ -6,8 +6,10 @@ from ..functions.digitigrade_legs import AvatarToolKit_OT_CreateDigitigradeLegs
 from ..functions.resonite_functions import AvatarToolKit_OT_ConvertToResonite
 from ..functions.translations import t
 from ..core.common import get_selected_armature
+from ..functions.mesh_tools import AvatarToolkit_OT_RemoveUnusedShapekeys
 from ..functions.seperate_by import AvatarToolKit_OT_SeparateByMaterials, AvatarToolKit_OT_SeparateByLooseParts
 from ..functions.additional_tools import AvatarToolKit_OT_ApplyTransforms
+from ..functions.armature_modifying import AvatarToolkit_OT_RemoveZeroWeightBones, AvatarToolkit_OT_MergeBonesToActive, AvatarToolkit_OT_MergeBonesToParents
 
 @register_wrap
 class AvatarToolkit_PT_ToolsPanel(bpy.types.Panel):
@@ -39,5 +41,11 @@ class AvatarToolkit_PT_ToolsPanel(bpy.types.Panel):
             row.operator(AvatarToolKit_OT_SeparateByLooseParts.bl_idname, text=t("Tools.separate_by_loose_parts.label"), icon='OUTLINER_OB_MESH')
             row = layout.row(align=True)
             row.operator(AvatarToolKit_OT_ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN')
+            row.operator(AvatarToolkit_OT_RemoveUnusedShapekeys.bl_idname, text=t("Tools.remove_unused_shapekeys.label"), icon='SHAPEKEY_DATA')
+            row = layout.row(align=True)
+            row.operator(AvatarToolkit_OT_RemoveZeroWeightBones.bl_idname, text=t("Tools.remove_zero_weight_bones.label"), icon='BONE_DATA')
+            row = layout.row(align=True)
+            row.operator(AvatarToolkit_OT_MergeBonesToActive.bl_idname, text=t("Tools.merge_bones_to_active.label"), icon='BONE_DATA')
+            row.operator(AvatarToolkit_OT_MergeBonesToParents.bl_idname, text=t("Tools.merge_bones_to_parents.label"), icon='BONE_DATA')
         else:
             layout.label(text=t("Tools.select_armature"), icon='ERROR')

ui/uv_panel.py

@@ -0,0 +1,17 @@
+import bpy
+from ..core.register import register_wrap
+from ..functions.translations import t
+from .panel import draw_title
+
+@register_wrap
+class UVTools_PT_MainPanel(bpy.types.Panel):
+    bl_label = t("AvatarToolkit.label")
+    bl_idname = "OBJECT_PT_avatar_toolkit_uv"
+    bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'UI'
+    bl_category = "Avatar Toolkit"
+
+    def draw(self: bpy.types.Panel, context: bpy.types.Context):
+        layout = self.layout
+
+        draw_title(self)

ui/uv_tools.py

@@ -0,0 +1,22 @@
+
+import bpy
+from ..core.register import register_wrap
+from ..functions.translations import t
+from ..functions.uv_tools import AvatarToolkit_OT_AlignUVEdgesToTarget
+from .panel import draw_title
+
+@register_wrap
+class UVTools_PT_Tools(bpy.types.Panel):
+    bl_label = t("Tools.label")
+    bl_idname = "OBJECT_PT_avatar_toolkit_uv_tools"
+    bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'UI'
+    bl_category = "Avatar Toolkit"
+    bl_parent_id = "OBJECT_PT_avatar_toolkit_uv"
+    bl_order = 3
+
+    def draw(self, context: bpy.types.Context):
+        layout = self.layout
+
+        row = layout.row(align=True)
+        row.operator(AvatarToolkit_OT_AlignUVEdgesToTarget.bl_idname, text=t("avatar_toolkit.align_uv_edges_to_target.label"), icon='GP_MULTIFRAME_EDITING')