[Bf-blender-cvs] [694609e5e34] asset-browser-poselib: Merge branch 'master' into asset-browser-poselib

[Julian Eisel]

Commit: 694609e5e34e87c47cb959d30caf28e2eaa4e457
Author: Julian Eisel
Date:   Fri Mar 19 17:22:26 2021 +0100
Branches: asset-browser-poselib
https://developer.blender.org/rB694609e5e34e87c47cb959d30caf28e2eaa4e457

Merge branch 'master' into asset-browser-poselib

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_armature.h
index 8fc65c30459,a0ba1415b41..7f6d5ddb2bc
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@@ -201,16 -201,6 +201,11 @@@ void BKE_pose_apply_action(struct Objec
                             struct bAction *action,
                             struct AnimationEvalContext *anim_eval_context);
  
 +void BKE_pose_apply_action_blend(struct Object *ob,
 +                                 struct bAction *action,
 +                                 struct AnimationEvalContext *anim_eval_context,
 +                                 float blend_factor);
 +
- /* get_objectspace_bone_matrix has to be removed still */
- void get_objectspace_bone_matrix(struct Bone *bone,
-                                  float M_accumulatedMatrix[4][4],
-                                  int root,
-                                  int posed);
  void vec_roll_to_mat3(const float vec[3], const float roll, float r_mat[3][3]);
  void vec_roll_to_mat3_normalized(const float nor[3], const float roll, float r_mat[3][3]);
  void mat3_to_vec_roll(const float mat[3][3], float r_vec[3], float *r_roll);