diff options
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_hook.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 2ba5fb24292..8af9401e30f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -773,7 +773,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con, * the effect of the constraint */ invert_m4_m4(imat, pchan->pose_mat); - mult_m4_m4m4(tmat, pmat, imat); + mul_m4_m4m4(tmat, pmat, imat); invert_m4_m4(invmat, tmat); /* 5. restore constraints */ diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 69ad3f3225f..861dd4003e1 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -703,7 +703,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op) float imat[4][4], mat[4][4]; /* calculate the world-space matrix for the pose-channel target first, then carry on as usual */ - mult_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); invert_m4_m4(imat, mat); mul_serie_m4(hmd->parentinv, imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9e3f4a66e4d..02481ec5222 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -618,7 +618,7 @@ static bool ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGro /* Prepare transformation matrix.*/ invert_m4_m4(ob_src->imat, ob_src->obmat); - mult_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); + mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); /* Clear weights.*/ if (replace_mode == WT_REPLACE_ALL_WEIGHTS) { |