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/modifiers/intern/MOD_uvwarp.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/modifiers/intern/MOD_uvwarp.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvwarp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 7498d4dfce9..13629b02a86 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -98,7 +98,7 @@ static void matrix_from_obj_pchan(float mat[4][4], Object *ob, const char *bonen { bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, bonename); if (pchan) { - mult_m4_m4m4(mat, ob->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat); } else { copy_m4_m4(mat, ob->obmat); @@ -139,7 +139,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, matrix_from_obj_pchan(mat_dst, umd->object_dst, umd->bone_dst); invert_m4_m4(imat_dst, mat_dst); - mult_m4_m4m4(warp_mat, imat_dst, mat_src); + mul_m4_m4m4(warp_mat, imat_dst, mat_src); /* apply warp */ if (!is_zero_v2(umd->center)) { @@ -152,8 +152,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, invert_m4_m4(imat_cent, mat_cent); - mult_m4_m4m4(warp_mat, warp_mat, imat_cent); - mult_m4_m4m4(warp_mat, mat_cent, warp_mat); + mul_m4_m4m4(warp_mat, warp_mat, imat_cent); + mul_m4_m4m4(warp_mat, mat_cent, warp_mat); } /* make sure we're using an existing layer */ |