diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
| commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
| tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/ikplugin/intern/iksolver_plugin.c | |
| parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff) | |
BLI_math rename functions:
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4
these temporary names were used to avoid problems when argument order was switched.
Diffstat (limited to 'source/blender/ikplugin/intern/iksolver_plugin.c')
| -rw-r--r-- | source/blender/ikplugin/intern/iksolver_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c index 9ec115f10e8..c3b6df8ac85 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.c +++ b/source/blender/ikplugin/intern/iksolver_plugin.c @@ -198,7 +198,7 @@ static void make_dmats(bPoseChannel *pchan) if (pchan->parent) { float iR_parmat[4][4]; invert_m4_m4(iR_parmat, pchan->parent->pose_mat); - mult_m4_m4m4(pchan->chan_mat, iR_parmat, pchan->pose_mat); // delta mat + mul_m4_m4m4(pchan->chan_mat, iR_parmat, pchan->pose_mat); // delta mat } else { copy_m4_m4(pchan->chan_mat, pchan->pose_mat); @@ -217,7 +217,7 @@ static void where_is_ik_bone(bPoseChannel *pchan, float ik_mat[3][3]) // nr = if (pchan->parent) mul_serie_m4(pchan->pose_mat, pchan->parent->pose_mat, pchan->chan_mat, ikmat, NULL, NULL, NULL, NULL, NULL); else - mult_m4_m4m4(pchan->pose_mat, pchan->chan_mat, ikmat); + mul_m4_m4m4(pchan->pose_mat, pchan->chan_mat, ikmat); /* calculate head */ copy_v3_v3(pchan->pose_head, pchan->pose_mat[3]); @@ -362,7 +362,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) unit_m4(rootmat); copy_v3_v3(rootmat[3], pchan->pose_head); - mult_m4_m4m4(imat, ob->obmat, rootmat); + mul_m4_m4m4(imat, ob->obmat, rootmat); invert_m4_m4(goalinv, imat); for (target = tree->targets.first; target; target = target->next) { @@ -377,7 +377,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) BKE_get_constraint_target_matrix(scene, target->con, 0, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0); /* and set and transform goal */ - mult_m4_m4m4(goal, goalinv, rootmat); + mul_m4_m4m4(goal, goalinv, rootmat); copy_v3_v3(goalpos, goal[3]); copy_m3_m4(goalrot, goal); @@ -392,7 +392,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) break; } else { - mult_m4_m4m4(goal, goalinv, rootmat); + mul_m4_m4m4(goal, goalinv, rootmat); copy_v3_v3(polepos, goal[3]); poleconstrain = 1; |