Merge branch 'main' into RemoveUnusedShapekeys

2024-09-10 20:36:38 -04:00
parent 9bdaa1ef01 e53beb05fc
commit f7d4e4e5e9
21 changed files with 281 additions and 93 deletions
@@ -1,13 +1,13 @@
 from bpy.types import UIList, Panel, UILayout, Object, Context,Material, Operator
 import bpy
 from ..core.register import register_wrap
-from .panel import AvatarToolkitPanel
-from ..core.common import SceneMatClass, material_list_bool, get_selected_armature
-from ..functions.atlas_materials import Atlas_Materials
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
+from ..core.common import SceneMatClass, MaterialListBool, get_selected_armature
+from ..functions.atlas_materials import AvatarToolKit_OT_AtlasMaterials
 from ..functions.translations import t

@register_wrap
-class ExpandSection_Materials(Operator):
+class AvatarToolKit_OT_ExpandSectionMaterials(Operator):
    bl_idname = 'avatar_toolkit.expand_section_materials'
    bl_label = ""
    bl_description = ""
@@ -28,13 +28,13 @@ class ExpandSection_Materials(Operator):
                                newlist.append(mat_slot.material)
                                newitem: SceneMatClass = context.scene.materials.add()
                                newitem.mat = mat_slot.material
-            material_list_bool.old_list[context.scene.name] = newlist
+            MaterialListBool.old_list[context.scene.name] = newlist
        else:
            context.scene.texture_atlas_Has_Mat_List_Shown = False
        return {'FINISHED'}

@register_wrap
-class MaterialTextureAtlasProperties(UIList):
+class AvatarToolKit_UL_MaterialTextureAtlasProperties(UIList):
    bl_label = t("TextureAtlas.material_list_label")
    bl_idname = "Material_UL_avatar_toolkit_texture_atlas_mat_list_mat"
    bl_space_type = 'VIEW_3D'
@@ -59,13 +59,13 @@ class MaterialTextureAtlasProperties(UIList):
            col.prop(item.mat, "texture_atlas_roughness")

@register_wrap
-class TextureAtlasPanel(Panel):
+class AvatarToolKit_PT_TextureAtlasPanel(Panel):
    bl_label = t("TextureAtlas.label")
    bl_idname = "OBJECT_PT_avatar_toolkit_texture_atlas"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 4

    def draw(self, context: Context):
@@ -77,12 +77,12 @@ class TextureAtlasPanel(Panel):
            boxoutter = row.box()
            direction_icon = 'RIGHTARROW' if not context.scene.texture_atlas_Has_Mat_List_Shown else 'DOWNARROW_HLT'
            row = boxoutter.row()
-            row.operator(ExpandSection_Materials.bl_idname, text=(t("TextureAtlas.reload_list") if not context.scene.texture_atlas_Has_Mat_List_Shown else t("TextureAtlas.loaded_list")), icon=direction_icon)
+            row.operator(AvatarToolKit_OT_ExpandSectionMaterials.bl_idname, text=(t("TextureAtlas.reload_list") if not context.scene.texture_atlas_Has_Mat_List_Shown else t("TextureAtlas.loaded_list")), icon=direction_icon)
            if context.scene.texture_atlas_Has_Mat_List_Shown:
                row = boxoutter.row()
-                row.template_list(MaterialTextureAtlasProperties.bl_idname, 'material_list', context.scene, 'materials',
+                row.template_list(AvatarToolKit_UL_MaterialTextureAtlasProperties.bl_idname, 'material_list', context.scene, 'materials',
                                context.scene, 'texture_atlas_material_index', rows=12, type='DEFAULT')
                row = layout.row()
-                row.operator(Atlas_Materials.bl_idname, text=t("TextureAtlas.atlas_materials"))
+                row.operator(AvatarToolKit_OT_AtlasMaterials.bl_idname, text=t("TextureAtlas.atlas_materials"))
        else:
            layout.label(text=t("Tools.select_armature"), icon='ERROR')
@@ -1,18 +1,20 @@
 import bpy
 from ..core.register import register_wrap
-from .panel import AvatarToolkitPanel
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from ..functions.translations import t
-from ..functions.remove_doubles_safely import RemoveDoublesSafely, RemoveDoublesSafelyAdvanced
+from ..functions.remove_doubles_safely import AvatarToolKit_OT_RemoveDoublesSafely, AvatarToolKit_OT_RemoveDoublesSafelyAdvanced
 from ..core.common import get_selected_armature
+from ..functions.join_meshes import AvatarToolKit_OT_JoinAllMeshes, AvatarToolKit_OT_JoinSelectedMeshes
+from ..functions.combine_materials import AvatarToolKit_OT_CombineMaterials

@register_wrap
-class AvatarToolkitOptimizationPanel(bpy.types.Panel):
+class AvatarToolkit_PT_OptimizationPanel(bpy.types.Panel):
    bl_label = t("Optimization.label")
    bl_idname = "OBJECT_PT_avatar_toolkit_optimization"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 2

    def draw(self, context):
@@ -24,18 +26,18 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel):
            
            row = layout.row()
            row.scale_y = 1.2 
-            row.operator("avatar_toolkit.combine_materials", text=t("Optimization.combine_materials.label"), icon='MATERIAL')
+            row.operator(AvatarToolKit_OT_CombineMaterials.bl_idname, text=t("Optimization.combine_materials.label"), icon='MATERIAL')
            row = layout.row(align=True)
            row.scale_y = 1.2 
-            row.operator(RemoveDoublesSafely.bl_idname, text=t("Optimization.remove_doubles_safely.label"), icon='SNAP_VERTEX')
-            row.operator(RemoveDoublesSafelyAdvanced.bl_idname, text=t("Optimization.remove_doubles_safely_advanced.label"), icon = "ACTION")
+            row.operator(AvatarToolKit_OT_RemoveDoublesSafely.bl_idname, text=t("Optimization.remove_doubles_safely.label"), icon='SNAP_VERTEX')
+            row.operator(AvatarToolKit_OT_RemoveDoublesSafelyAdvanced.bl_idname, text=t("Optimization.remove_doubles_safely_advanced.label"), icon = "ACTION")
            layout.separator(factor=0.5)
            
            layout.label(text=t("Optimization.joinmeshes.label"), icon='SETTINGS')
            row = layout.row(align=True)
            row.scale_y = 1.2 
-            row.operator("avatar_toolkit.join_all_meshes", text=t("Optimization.join_all_meshes.label"), icon='OUTLINER_OB_MESH')
-            row.operator("avatar_toolkit.join_selected_meshes", text=t("Optimization.join_selected_meshes.label"), icon='STICKY_UVS_LOC')
+            row.operator(AvatarToolKit_OT_JoinAllMeshes.bl_idname, text=t("Optimization.join_all_meshes.label"), icon='OUTLINER_OB_MESH')
+            row.operator(AvatarToolKit_OT_JoinSelectedMeshes.bl_idname, text=t("Optimization.join_selected_meshes.label"), icon='STICKY_UVS_LOC')
            
        else:
            layout.label(text=t("Optimization.select_armature"), icon='ERROR')
@@ -2,13 +2,15 @@ import bpy
 from ..core.register import register_wrap
 from ..functions.translations import t

+CATEGORY_NAME = "Avatar Toolkit"
+
@register_wrap
-class AvatarToolkitPanel(bpy.types.Panel):
+class AvatarToolKit_PT_AvatarToolkitPanel(bpy.types.Panel):
    bl_label = t("AvatarToolkit.label")
    bl_idname = "OBJECT_PT_avatar_toolkit"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
+    bl_category = CATEGORY_NAME

    def draw(self, context):
        layout = self.layout
@@ -1,23 +1,23 @@
 import bpy
 from ..core.register import register_wrap
-from .panel import AvatarToolkitPanel
-from bpy.types import Context
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
+from ..core.export_resonite import AvatarToolKit_OT_ExportResonite
+from bpy.types import Context, Mesh, Panel, Operator
 from ..functions.translations import t

 from ..core.import_pmx import import_pmx
 from ..core.import_pmd import import_pmd
-from ..functions.import_anything import ImportAnyModel
-from ..core.common import get_selected_armature, set_selected_armature
+from ..functions.import_anything import AvatarToolKit_OT_ImportAnyModel
+from ..core.common import get_selected_armature, set_selected_armature, get_all_meshes

@register_wrap
-@register_wrap
-class AvatarToolkitQuickAccessPanel(bpy.types.Panel):
+class AvatarToolkitQuickAccessPanel(Panel):
    bl_label = t("Quick_Access.label")
    bl_idname = "OBJECT_PT_avatar_toolkit_quick_access"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 1

    def draw(self, context: Context):
@@ -35,11 +35,23 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel):

        row = layout.row(align=True)
        row.scale_y = 1.5  
-        row.operator(ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT')
-        row.operator("avatar_toolkit.export_menu", text=t("Quick_Access.export"), icon='EXPORT')
+        row.operator(AvatarToolKit_OT_ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT')
+        row.operator(AVATAR_TOOLKIT_OT_ExportMenu.bl_idname, text=t("Quick_Access.export"), icon='EXPORT')
+        
+        if get_selected_armature(context) != None:
+            if(context.mode == "POSE"):
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_StopPoseMode.bl_idname, text=t("Quick_Access.stop_pose_mode.label"), icon='POSE_HLT')
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_ApplyPoseAsRest.bl_idname, text=t("Quick_Access.apply_pose_as_rest.label"), icon='MOD_ARMATURE')
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_ApplyPoseAsShapekey.bl_idname, text=t("Quick_Access.apply_pose_as_shapekey.label"), icon='MOD_ARMATURE')
+            else:
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_StartPoseMode.bl_idname, text=t("Quick_Access.start_pose_mode.label"), icon='POSE_HLT')

@register_wrap
-class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator):
+class AVATAR_TOOLKIT_OT_ExportMenu(bpy.types.Operator):
    bl_idname = "avatar_toolkit.export_menu"
    bl_label = t("Quick_Access.export_menu.label")
    bl_description = t("Quick_Access.export_menu.desc")
@@ -48,7 +60,7 @@ class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator):
    def poll(cls, context):
        return any(obj.type == 'MESH' for obj in context.scene.objects)

-    def execute(self, context: Context):
+    def execute(self, context: Context) -> set[str]:
        return {'FINISHED'}

    def invoke(self, context: Context, event):
@@ -58,16 +70,180 @@ class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator):
    def draw(self, context: Context):
        layout = self.layout
        layout.label(text=t("Quick_Access.select_export.label"), icon='EXPORT')
-        layout.operator("avatar_toolkit.export_resonite", text=t("Quick_Access.select_export_resonite.label"), icon='SCENE_DATA')
-        layout.operator("avatar_toolkit.export_fbx", text=t("Quick_Access.export_fbx.label"), icon='OBJECT_DATA')
+        layout.operator(AvatarToolKit_OT_ExportResonite.bl_idname, text=t("Quick_Access.select_export_resonite.label"), icon='SCENE_DATA')
+        layout.operator(AVATAR_TOOLKIT_OT_ExportFbx.bl_idname, text=t("Quick_Access.export_fbx.label"), icon='OBJECT_DATA')

@register_wrap
-class AVATAR_TOOLKIT_OT_export_fbx(bpy.types.Operator):
+class AVATAR_TOOLKIT_OT_ExportFbx(bpy.types.Operator):
    bl_idname = 'avatar_toolkit.export_fbx'
    bl_label = t("Quick_Access.export_fbx.label")
    bl_description = t("Quick_Access.export_fbx.desc")
    bl_options = {'REGISTER', 'UNDO', 'INTERNAL'}

-    def execute(self, context):
+    def execute(self, context) -> set[str]:
        bpy.ops.export_scene.fbx('INVOKE_DEFAULT')
        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_StartPoseMode(Operator):
+    bl_idname = 'avatar_toolkit.start_pose_mode'
+    bl_label = t("Quick_Access.start_pose_mode.label")
+    bl_description = t("Quick_Access.start_pose_mode.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode != "POSE"
+    
+    def execute(self, context: Context) -> set[str]:
+        context.view_layer.objects.active = get_selected_armature(context)
+        bpy.ops.object.mode_set(mode='OBJECT')
+        bpy.ops.object.select_all(action='DESELECT')
+        context.view_layer.objects.active = get_selected_armature(context)
+        context.view_layer.objects.active.select_set(True)
+        bpy.ops.object.mode_set(mode='POSE')
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_StopPoseMode(Operator):
+    bl_idname = 'avatar_toolkit.stop_pose_mode'
+    bl_label = t("Quick_Access.stop_pose_mode.label")
+    bl_description = t("Quick_Access.stop_pose_mode.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context) -> set[str]:
+        bpy.ops.pose.transforms_clear()
+        bpy.ops.pose.select_all(action="INVERT")
+        bpy.ops.pose.transforms_clear()
+        bpy.ops.pose.select_all(action="INVERT")
+        bpy.ops.object.mode_set(mode='OBJECT')
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_ApplyPoseAsShapekey(Operator):
+    bl_idname = 'avatar_toolkit.apply_pose_as_shapekey'
+    bl_label = t("Quick_Access.apply_pose_as_shapekey.label")
+    bl_description = t("Quick_Access.apply_pose_as_shapekey.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context):
+        bpy.ops.object.mode_set(mode="OBJECT")
+        for obj in get_all_meshes(context):
+            modifier_armature_name: str = ""
+            context.view_layer.objects.active = obj
+            bpy.ops.object.mode_set(mode="OBJECT")
+            bpy.ops.object.select_all(action="DESELECT")
+            context.view_layer.objects.active = obj
+            obj.select_set(True)
+            for modifier in obj.modifiers:
+                if modifier.type == "ARMATURE":
+                    arm_modifier: bpy.types.ArmatureModifier = modifier
+                    modifier_armature_name = arm_modifier.object.name
+            bpy.ops.object.modifier_apply_as_shapekey(modifier=modifier_armature_name,keep_modifier=True,report=True)
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_ApplyPoseAsRest(Operator):
+    bl_idname = 'avatar_toolkit.apply_pose_as_rest'
+    bl_label = t("Quick_Access.apply_pose_as_rest.label")
+    bl_description = t("Quick_Access.apply_pose_as_rest.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context):
+        for obj in get_all_meshes(context):
+            mesh_data: Mesh = obj.data
+
+            if mesh_data.shape_keys:
+                shape_key_obj_list: list[bpy.types.Object] = []
+                modifier_armature_name: str = ""
+
+                for modifier in obj.modifiers:
+                    if modifier.type == "ARMATURE":
+                        arm_modifier: bpy.types.ArmatureModifier = modifier
+                        modifier_armature_name = arm_modifier.object.name
+                for idx,shape in enumerate(mesh_data.shape_keys.key_blocks):
+                    if idx == 0:
+                        continue
+                    context.view_layer.objects.active = obj
+                    
+                    bpy.ops.object.mode_set(mode="OBJECT")
+                    bpy.ops.object.select_all(action="DESELECT")
+                    context.view_layer.objects.active = obj
+                    obj.select_set(True)
+
+                    bpy.ops.object.duplicate()
+
+                    shape_obj = context.view_layer.objects.active
+
+                    shape_obj.active_shape_key_index = idx
+                    shape_obj.name = shape.name
+                    
+                    bpy.ops.object.shape_key_move(type="TOP")
+
+                    bpy.ops.object.mode_set(mode="EDIT")
+                    bpy.ops.object.mode_set(mode="OBJECT")
+
+                    bpy.ops.object.shape_key_remove(all=True)
+
+                    bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+
+                    shape_key_obj_list.append(shape_obj)
+                context.view_layer.objects.active = obj
+                    
+                bpy.ops.object.mode_set(mode="OBJECT")
+                context.view_layer.objects.active.select_set(True)
+                bpy.ops.object.shape_key_remove(all=True)
+                bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+                bpy.ops.object.select_all(action="DESELECT")
+
+                for shapekey_obj in shape_key_obj_list:
+                    shapekey_obj.select_set(True)
+                context.view_layer.objects.active = obj
+                context.view_layer.objects.active.select_set(True)
+
+                try:
+                    bpy.ops.object.join_shapes()
+                except:
+                    self.report({'ERROR'}, t("Quick_Access.apply_armature_failed"))
+                    context.view_layer.objects.active = shape_key_obj_list[0]
+                    obj.select_set(False)
+                    bpy.ops.object.delete(confirm=False)
+                    return {'CANCELLED'}
+                context.view_layer.objects.active = shape_key_obj_list[0]
+                obj.select_set(False)
+                bpy.ops.object.delete(confirm=False)
+            else:
+                modifier_armature_name: str = ""
+
+                for modifier in obj.modifiers:
+                    if modifier.type == "ARMATURE":
+                        arm_modifier: bpy.types.ArmatureModifier = modifier
+                        modifier_armature_name = arm_modifier.object.name
+                context.view_layer.objects.active = obj
+                bpy.ops.object.mode_set(mode="OBJECT")
+                bpy.ops.object.select_all(action="DESELECT")
+                context.view_layer.objects.active.select_set(True)
+                bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+
+            armature_obj: bpy.types.Object = get_selected_armature(context)
+            
+            context.view_layer.objects.active = armature_obj
+            armature_obj.select_set(True)
+            bpy.ops.object.mode_set(mode="OBJECT")
+            bpy.ops.object.mode_set(mode="POSE")
+
+            bpy.ops.pose.armature_apply(selected=False)
+
+        return {'FINISHED'}
@@ -1,6 +1,6 @@
 import bpy
 from ..core.register import register_wrap
-from .panel import AvatarToolkitPanel
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from ..functions.translations import t

@register_wrap
@@ -9,8 +9,8 @@ class AvatarToolkitSettingsPanel(bpy.types.Panel):
    bl_idname = "OBJECT_PT_avatar_toolkit_settings"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 6

    def draw(self, context):
@@ -1,22 +1,23 @@
 import bpy
 from ..core.register import register_wrap
-from .panel import AvatarToolkitPanel
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from bpy.types import Context
-from ..functions.digitigrade_legs import CreateDigitigradeLegs
+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.seperate_by import SeparateByMaterials, SeparateByLooseParts
-from ..functions.additional_tools import ApplyTransforms
 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_ApplyTransform

@register_wrap
-class AvatarToolkitToolsPanel(bpy.types.Panel):
+class AvatarToolkit_PT_ToolsPanel(bpy.types.Panel):
    bl_label = t("Tools.label")
    bl_idname = "OBJECT_PT_avatar_toolkit_tools"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 3

    def draw(self, context: Context):
@@ -29,16 +30,16 @@ class AvatarToolkitToolsPanel(bpy.types.Panel):

            row = layout.row(align=True)
            row.scale_y = 1.5  
-            row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label"), icon='SCENE_DATA')
+            row.operator(AvatarToolKit_OT_ConvertToResonite.bl_idname, text=t("Tools.convert_to_resonite.label"), icon='SCENE_DATA')
            row = layout.row(align=True)
-            row.operator(CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA')
+            row.operator(AvatarToolKit_OT_CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA')
            layout.separator()
            row = layout.row(align=True)
            layout.label(text=t("Tools.separate_by.label"), icon='MESH_DATA')
-            row.operator(SeparateByMaterials.bl_idname, text=t("Tools.separate_by_materials.label"), icon='MATERIAL')
-            row.operator(SeparateByLooseParts.bl_idname, text=t("Tools.separate_by_loose_parts.label"), icon='OUTLINER_OB_MESH')
+            row.operator(AvatarToolKit_OT_SeparateByMaterials.bl_idname, text=t("Tools.separate_by_materials.label"), icon='MATERIAL')
+            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(ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN')
+            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')
        else:
            layout.label(text=t("Tools.select_armature"), icon='ERROR')
@@ -1,5 +1,7 @@
 import bpy
 from ..core.register import register_wrap
+from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
+from ..functions.viseme import AvatarToolKit_OT_AutoVisemeButton
 from ..functions.translations import t
 from ..core.common import get_selected_armature

@@ -9,8 +11,8 @@ class AvatarToolkitVisemePanel(bpy.types.Panel):
    bl_idname = "OBJECT_PT_avatar_toolkit_viseme"
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'UI'
-    bl_category = "Avatar Toolkit"
-    bl_parent_id = "OBJECT_PT_avatar_toolkit"
+    bl_category = CATEGORY_NAME
+    bl_parent_id = AvatarToolKit_PT_AvatarToolkitPanel.bl_idname
    bl_order = 5

    def draw(self, context: bpy.types.Context) -> None:
@@ -32,7 +34,7 @@ class AvatarToolkitVisemePanel(bpy.types.Panel):

                    row = layout.row()
                    row.scale_y = 1.2
-                    row.operator("avatar_toolkit.create_visemes", text=t('VisemePanel.create_visemes'), icon='TRIA_RIGHT')
+                    row.operator(AvatarToolKit_OT_AutoVisemeButton.bl_idname, text=t('VisemePanel.create_visemes'), icon='TRIA_RIGHT')
                else:
                    layout.label(text=t('VisemePanel.error.noShapekeys'), icon='ERROR')
            else: