Merge branch 'main' into Import-Anything

ui/optimization.py

@@ -2,6 +2,7 @@ import bpy
 from ..core.register import register_wrap
 from .panel import AvatarToolkitPanel
 from ..functions.translations import t
+from ..core.common import get_selected_armature
 
 @register_wrap
 class AvatarToolkitOptimizationPanel(bpy.types.Panel):
@@ -14,20 +15,21 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel):
 
     def draw(self, context):
         layout = self.layout
-        layout.label(text=t("Optimization.options.label"))
+        armature = get_selected_armature(context)
         
-        row = layout.row()
-        row.scale_y = 1.2 
-        row.operator("avatar_toolkit.combine_materials", text=t("Optimization.combine_materials.label"))
-        
-
-        layout.separator(factor=0.5)
-        
-        row = layout.row(align=True)
-        row.scale_y = 1.2 
-        row.operator("avatar_toolkit.join_all_meshes", text=t("Optimization.join_all_meshes.label"))
-        row.operator("avatar_toolkit.join_selected_meshes", text=t("Optimization.join_selected_meshes.label"))
-        row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
-
-        # Add optimization options here
-
+        if armature:
+            layout.label(text=t("Optimization.options.label"))
+            
+            row = layout.row()
+            row.scale_y = 1.2 
+            row.operator("avatar_toolkit.combine_materials", text=t("Optimization.combine_materials.label"))
+            
+            layout.separator(factor=0.5)
+            
+            row = layout.row(align=True)
+            row.scale_y = 1.2 
+            row.operator("avatar_toolkit.join_all_meshes", text=t("Optimization.join_all_meshes.label"))
+            row.operator("avatar_toolkit.join_selected_meshes", text=t("Optimization.join_selected_meshes.label"))
+            row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
+        else:
+            layout.label(text="Please select an armature in Quick Access")

ui/quick_access.py

@@ -7,6 +7,7 @@ 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
 
 @register_wrap
 class AvatarToolkitQuickAccessPanel(bpy.types.Panel):
@@ -21,6 +22,8 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel):
         layout = self.layout
         layout.label(text=t("Quick_Access.options"))
 
+        layout.prop(context.scene, "selected_armature", text="Select Armature")
+
         row = layout.row()
         row.label(text=t("Quick_Access.import_export.label"), icon='IMPORT')
         
@@ -64,5 +67,3 @@ class AVATAR_TOOLKIT_OT_export_fbx(bpy.types.Operator):
     def execute(self, context):
         bpy.ops.export_scene.fbx('INVOKE_DEFAULT')
         return {'FINISHED'}
-
-

ui/tools.py

@@ -3,6 +3,7 @@ from ..core.register import register_wrap
 from .panel import AvatarToolkitPanel
 from bpy.types import Context
 from ..functions.translations import t
+from ..core.common import get_selected_armature
 
 @register_wrap
 class AvatarToolkitToolsPanel(bpy.types.Panel):
@@ -15,11 +16,16 @@ class AvatarToolkitToolsPanel(bpy.types.Panel):
 
     def draw(self, context: Context):
         layout = self.layout
-        layout.label(text=t("Tools.tools_title.label"))
-        layout.separator(factor=0.5)
+        armature = get_selected_armature(context)
+        
+        if armature:
+            layout.label(text=t("Tools.tools_title.label"))
+            layout.separator(factor=0.5)
 
-        row = layout.row(align=True)
-        row.scale_y = 1.5  
-        row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label"))
-        row = layout.row(align=True)
-        row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
+            row = layout.row(align=True)
+            row.scale_y = 1.5  
+            row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label"))
+            row = layout.row(align=True)
+            row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
+        else:
+            layout.label(text="Please select an armature in Quick Access")