Merge pull request 'Function to select bones in pose' (#24) from select-button into develop

Reviewed-on: #24

common.py

@@ -37,6 +37,17 @@ def searchPoseMarker(context, posename, type):
         pass
 
 
+def selectBonesinPose(context, posename, active_marker):
+    try:
+        arm_object, pose_library = getArmatureData(context)
+        for bone in arm_object.pose.bones:
+            bone.bone.select = False
+            if findKeyframe(context, bone, active_marker.frame):
+                bone.bone.select = True
+    except:
+        pass
+
+
 def findFcurve(context, bone_name, transform, index_int):
     arm_object, pose_library = getArmatureData(context)
     pose_markers = pose_library.pose_markers
@@ -94,11 +105,7 @@ def setKeyframesFromBones(context, arm_object, new_marker):
         if bone.bone.select or none_selected == True:
             bone_name = bone.name
 
-            if bone.rotation_mode == "XYZ":
-                rot_mode = "rotation_euler"
-            elif bone.rotation_mode == "YZX":
-                rot_mode = "rotation_euler"
-            elif bone.rotation_mode == "ZXY":
+            if bone.rotation_mode in ("XYZ", "XZY", "YXZ", "YZX", "ZXY", "ZYX"):
                 rot_mode = "rotation_euler"
             elif bone.rotation_mode == "QUATERNION":
                 rot_mode = "rotation_quaternion"
@@ -162,11 +169,7 @@ def setBonesfromKeyframes(context, arm_object, active_marker):
             if findKeyframe(context, bone, active_marker.frame) is None:
                 continue
 
-            if bone.rotation_mode == "XYZ":
-                rot_mode = "rotation_euler"
-            elif bone.rotation_mode == "YZX":
-                rot_mode = "rotation_euler"
-            elif bone.rotation_mode == "ZXY":
+            if bone.rotation_mode in ("XYZ", "XZY", "YXZ", "YZX", "ZXY", "ZYX"):
                 rot_mode = "rotation_euler"
             elif bone.rotation_mode == "QUATERNION":
                 rot_mode = "rotation_quaternion"
@@ -191,21 +194,9 @@ def setBonesfromKeyframes(context, arm_object, active_marker):
             scl_z = findFcurve(context, bone_name, "scale", 2) or 1.0
 
             bone.location = mathutils.Vector((loc_x, loc_y, loc_z))
-            if bone.rotation_mode == "XYZ":
+            if rot_mode == "rotation_euler": 
                 bone.rotation_euler = mathutils.Euler(
                     (rot_x, rot_y, rot_z))
-            elif bone.rotation_mode == "YZX":
-                bone.rotation_euler = mathutils.Euler(
-                    (rot_x, rot_y, rot_z))
-            elif bone.rotation_mode == "ZXY":
-                bone.rotation_euler = mathutils.Euler(
-                    (rot_z, rot_x, rot_y))
-            elif bone.rotation_mode == "YXZ":
-                bone.rotation_euler = mathutils.Euler(
-                    (rot_y, rot_x, rot_z))
-            elif bone.rotation_mode == "XZY":
-                bone.rotation_euler = mathutils.Euler(
-                    (rot_x, rot_z, rot_y))
             elif rot_mode == "rotation_quaternion":
                 bone.rotation_quaternion = mathutils.Quaternion(
                     (rot_w, rot_x, rot_y, rot_z))

operators.py

@@ -254,7 +254,7 @@ class DSPL_OT_MovePose(bpy.types.Operator):
 class DSPL_OT_ApplyPose(bpy.types.Operator):
     bl_idname = "dspl.apply_pose"
     bl_label = "Apply Pose"
-    bl_description = "Apply Pose (Ctrl+Click to select, Shift+Click to rename, Alt+Click to remove)"
+    bl_description = "Apply Pose (Ctrl+Click to select bones, Shift+Click to rename, Alt+Click to remove)"
     bl_options = {'REGISTER', 'UNDO'}
 
     posename: bpy.props.StringProperty()
@@ -283,9 +283,16 @@ class DSPL_OT_ApplyPose(bpy.types.Operator):
 
     def invoke(self, context, event):
         if event.ctrl:
-            # Select
+            # Select bones
             arm_object, pose_library = getArmatureData(context)
-            pose_library.pose_markers.active_index = searchPoseMarker(context, posename=self.posename, type="index")
+            active_marker = searchPoseMarker(context, posename=self.posename, type="marker")
+
+            arm_object.select = True
+            bpy.context.view_layer.objects.active = arm_object
+            bpy.ops.object.mode_set(mode='POSE')
+            selectBonesinPose(context, self.posename, active_marker)
+
+            self.execute(context)
             return {'FINISHED'}
         elif event.alt:
             # Remove