Merge pull request #48 from 989onan/PoseMode

fix operator locations

functions/armature_modifying.py

@@ -1,8 +1,194 @@
 import bpy
-from ..core import common
-from bpy.types import Operator, Context, Mesh, Armature, EditBone
 from ..core.register import register_wrap
-from .translations import t
+from ..ui.panel import AvatarToolkitPanel
+from bpy.types import Context, Mesh, Panel, Operator, Armature, EditBone
+from ..functions.translations import t
+from ..core.common import get_selected_armature, get_all_meshes
+from ..core import common
+
+@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]:
+        
+        #give an active object so the next line doesn't throw an error.
+        context.view_layer.objects.active = get_selected_armature(context)
+
+        bpy.ops.object.mode_set(mode='OBJECT')
+
+        #deselect everything and select just our armature, then go into pose on just our selected armature. - @989onan
+        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]:
+        #this is done so that transforms are cleared but user selection is respected. - @989onan
+        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)
+
+                    #create duplicate of object
+                    bpy.ops.object.duplicate()
+
+                    shape_obj = context.view_layer.objects.active
+
+                    #make current shapekey a separate object
+                    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)
+
+                    #for modifier_name in [i.name for i in shape_obj.modifiers]:
+                    #    bpy.ops.object.modifier_remove(modifier=modifier_name)
+
+                    shape_key_obj_list.append(shape_obj) #add to a list of shape key objects
+                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"))
+                    #delete shapekey objects to not leave ourselves in a bad exit state - @989onan
+                    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'}
 
 @register_wrap
 class AvatarToolkit_OT_RemoveZeroWeightBones(Operator):

ui/quick_access.py

@@ -7,7 +7,8 @@ from ..functions.translations import t
 
 from ..core.import_pmx import import_pmx
 from ..core.import_pmd import import_pmd
-from ..functions.import_anything import AvatarToolKit_OT_ImportAnyModel
+from ..functions.import_anything import ImportAnyModel
+from ..functions.armature_modifying import AvatarToolkit_OT_StartPoseMode, AvatarToolkit_OT_StopPoseMode, AvatarToolkit_OT_ApplyPoseAsRest, AvatarToolkit_OT_ApplyPoseAsShapekey
 from ..core.common import get_selected_armature, set_selected_armature, get_all_meshes
 
 @register_wrap
@@ -83,167 +84,3 @@ class AVATAR_TOOLKIT_OT_ExportFbx(bpy.types.Operator):
     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'}