Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-20 09:30:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-20 09:34:30 +0300
commit320e7f5322a56ffcb3174d200701bb7a8c43ccef (patch)
tree6bf4ca2111a31bcd1312ca67e19be50145d1b6a1 /source/blender/makesrna/intern/rna_armature_api.c
parentb2b53ee9dbdb7293de6b5e13139bad735178aeff (diff)
Cleanup: naming
Diffstat (limited to 'source/blender/makesrna/intern/rna_armature_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_armature_api.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c
index cc311fbe1d2..e955a37a83f 100644
--- a/source/blender/makesrna/intern/rna_armature_api.c
+++ b/source/blender/makesrna/intern/rna_armature_api.c
@@ -69,20 +69,20 @@ static void rna_Bone_convert_local_to_pose(Bone *bone, float *r_matrix, float *m
if (is_zero_m4(parent_pose_mat) || is_zero_m4(parent_arm_mat)) {
/* No parent case. */
- BKE_calc_bone_parent_transform(bone->flag, bone_arm_mat, NULL, NULL, &bpt);
+ BKE_bone_parent_transform_calc_from_matrices(bone->flag, bone_arm_mat, NULL, NULL, &bpt);
}
else {
invert_m4_m4(offs_bone, parent_arm_mat);
mul_m4_m4m4(offs_bone, offs_bone, bone_arm_mat);
- BKE_calc_bone_parent_transform(bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt);
+ BKE_bone_parent_transform_calc_from_matrices(bone->flag, offs_bone, parent_arm_mat, parent_pose_mat, &bpt);
}
if (invert) {
- BKE_invert_bone_parent_transform(&bpt);
+ BKE_bone_parent_transform_invert(&bpt);
}
- BKE_apply_bone_parent_transform(&bpt, (float (*)[4])matrix, (float (*)[4])r_matrix);
+ BKE_bone_parent_transform_apply(&bpt, (float (*)[4])matrix, (float (*)[4])r_matrix);
}
static void rna_Bone_MatrixFromAxisRoll(float *axis, float roll, float *r_matrix)