11 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 5e90aa10294..a1fdae5792c 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -418,7 +418,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 
 	for (j = 0; j < count - 1; j++) {
 		float tmp_mat[4][4];
-		mult_m4_m4m4(tmp_mat, offset, final_offset);
+		mul_m4_m4m4(tmp_mat, offset, final_offset);
 		copy_m4_m4(final_offset, tmp_mat);
 	}
 
@@ -539,7 +539,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 
 		if (end_cap) {
 			float endoffset[4][4];
-			mult_m4_m4m4(endoffset, offset, final_offset);
+			mul_m4_m4m4(endoffset, offset, final_offset);
 			bm_merge_dm_transform(bm, end_cap, endoffset, amd,
 			                      &dupe_op, (count == 1) ? dupe_op.slots_in : dupe_op.slots_out,
 			                      (count == 1) ? "geom" : "geom.out", &weld_op);
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 0616db36afa..ed5bb1d3f4d 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -526,7 +526,7 @@ static DerivedMesh *NewBooleanDerivedMesh_intern(
 	 * we need to compute the inverse transform from global to ob (inv_mat),
 	 * and the transform from ob to ob_select for use in interpolation (map_mat) */
 	invert_m4_m4(inv_mat, ob->obmat);
-	mult_m4_m4m4(map_mat, inv_mat, ob_select->obmat);
+	mul_m4_m4m4(map_mat, inv_mat, ob_select->obmat);
 	invert_m4_m4(inv_mat, ob_select->obmat);
 
 	{
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index d5620f91d6e..7c8f8bfc82f 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -158,7 +158,7 @@ static void sphere_do(
 	if (ctrl_ob) {
 		if (flag & MOD_CAST_USE_OB_TRANSFORM) {
 			invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat);
-			mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat);
+			mul_m4_m4m4(mat, ctrl_ob->imat, ob->obmat);
 			invert_m4_m4(imat, mat);
 		}
 
@@ -282,7 +282,7 @@ static void cuboid_do(
 	if (ctrl_ob) {
 		if (flag & MOD_CAST_USE_OB_TRANSFORM) {
 			invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat);
-			mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat);
+			mul_m4_m4m4(mat, ctrl_ob->imat, ob->obmat);
 			invert_m4_m4(imat, mat);
 		}
 
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c
index 19b6bc4a520..9d18c81d5bc 100644
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -157,7 +157,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm,
 	/* get world-space matrix of target, corrected for the space the verts are in */
 	if (hmd->subtarget[0] && pchan) {
 		/* bone target if there's a matching pose-channel */
-		mult_m4_m4m4(dmat, hmd->object->obmat, pchan->pose_mat);
+		mul_m4_m4m4(dmat, hmd->object->obmat, pchan->pose_mat);
 	}
 	else {
 		/* just object target */
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index dda711c28a3..f11ab3f0469 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -224,8 +224,8 @@ static void meshdeformModifier_do(
 
 	/* compute matrices to go in and out of cage object space */
 	invert_m4_m4(imat, mmd->object->obmat);
-	mult_m4_m4m4(cagemat, imat, ob->obmat);
-	mult_m4_m4m4(cmat, mmd->bindmat, cagemat);
+	mul_m4_m4m4(cagemat, imat, ob->obmat);
+	mul_m4_m4m4(cmat, mmd->bindmat, cagemat);
 	invert_m4_m4(iobmat, cmat);
 	copy_m3_m4(icagemat, iobmat);
 
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 3c886bafc79..00c343d1918 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -126,7 +126,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 		/* tmp is a transform from coords relative to the object's own origin,
 		 * to coords relative to the mirror object origin */
 		invert_m4_m4(tmp, mmd->mirror_ob->obmat);
-		mult_m4_m4m4(tmp, tmp, ob->obmat);
+		mul_m4_m4m4(tmp, tmp, ob->obmat);
 
 		/* itmp is the reverse transform back to origin-relative coordinates */
 		invert_m4_m4(itmp, tmp);
@@ -134,8 +134,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 		/* combine matrices to get a single matrix that translates coordinates into
 		 * mirror-object-relative space, does the mirror, and translates back to
 		 * origin-relative space */
-		mult_m4_m4m4(mtx, mtx, tmp);
-		mult_m4_m4m4(mtx, itmp, mtx);
+		mul_m4_m4m4(mtx, mtx, tmp);
+		mul_m4_m4m4(mtx, itmp, mtx);
 	}
 
 	result = CDDM_from_template(dm, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2);
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 4ec132ce24d..bbafa8c939e 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -202,7 +202,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 		/* calc the matrix relative to the axis object */
 		invert_m4_m4(mtx_tmp_a, ob->obmat);
 		copy_m4_m4(mtx_tx_inv, ltmd->ob_axis->obmat);
-		mult_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv);
+		mul_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv);
 
 		/* calc the axis vec */
 		mul_mat3_m4_v3(mtx_tx, axis_vec); /* only rotation component */
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index 45901f4a303..b6539f4b028 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -212,7 +212,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 				params.viewplane.ymax *= scay;
 
 				BKE_camera_params_compute_matrix(&params);
-				mult_m4_m4m4(tmpmat, params.winmat, projectors[i].projmat);
+				mul_m4_m4m4(tmpmat, params.winmat, projectors[i].projmat);
 			}
 		}
 		else {
@@ -223,7 +223,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 		mul_mat3_m4_fl(offsetmat, 0.5);
 		offsetmat[3][0] = offsetmat[3][1] = offsetmat[3][2] = 0.5;
 
-		mult_m4_m4m4(projectors[i].projmat, offsetmat, tmpmat);
+		mul_m4_m4m4(projectors[i].projmat, offsetmat, tmpmat);
 
 		/* calculate worldspace projector normal (for best projector test) */
 		projectors[i].normal[0] = 0;
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 */
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index c2a62231529..b63e293aa80 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -201,11 +201,11 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob,
 
 	invert_m4_m4(obinv, ob->obmat);
 
-	mult_m4_m4m4(mat_from, obinv, wmd->object_from->obmat);
-	mult_m4_m4m4(mat_to, obinv, wmd->object_to->obmat);
+	mul_m4_m4m4(mat_from, obinv, wmd->object_from->obmat);
+	mul_m4_m4m4(mat_to, obinv, wmd->object_to->obmat);
 
 	invert_m4_m4(tmat, mat_from); // swap?
-	mult_m4_m4m4(mat_final, tmat, mat_to);
+	mul_m4_m4m4(mat_final, tmat, mat_to);
 
 	invert_m4_m4(mat_from_inv, mat_from);
 
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c
index b713f56a4c2..89599a4e386 100644
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@ -193,7 +193,7 @@ static void waveModifier_do(WaveModifierData *md,
 		float mat[4][4];
 		/* get the control object's location in local coordinates */
 		invert_m4_m4(ob->imat, ob->obmat);
-		mult_m4_m4m4(mat, ob->imat, wmd->objectcenter->obmat);
+		mul_m4_m4m4(mat, ob->imat, wmd->objectcenter->obmat);
 
 		wmd->startx = mat[3][0];
 		wmd->starty = mat[3][1];