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.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index ffa4ee2a1d8..756492ea0f0 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1904,7 +1904,7 @@ static void object_solver_inverted_matrix(Scene *scene, Object *ob, float invmat
 				BKE_object_where_is_calc_mat4(scene, cam, invmat);
 			}
 
-			mult_m4_m4m4(invmat, invmat, data->invmat);
+			mul_m4_m4m4(invmat, invmat, data->invmat);
 
 			found = TRUE;
 		}
@@ -2108,7 +2108,7 @@ static void set_axis(Scene *scene,  Object *ob, MovieClip *clip, MovieTrackingOb
 	if (is_camera) {
 		invert_m4(mat);
 
-		mult_m4_m4m4(mat, mat, obmat);
+		mul_m4_m4m4(mat, mat, obmat);
 	}
 	else {
 		if (!flip) {
@@ -2125,7 +2125,7 @@ static void set_axis(Scene *scene,  Object *ob, MovieClip *clip, MovieTrackingOb
 			mul_serie_m4(mat, lmat, mat, ilmat, obmat, NULL, NULL, NULL, NULL);
 		}
 		else {
-			mult_m4_m4m4(mat, obmat, mat);
+			mul_m4_m4m4(mat, obmat, mat);
 		}
 	}
 
@@ -2217,14 +2217,14 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 		invert_m4(mat);
 
 		BKE_object_to_mat4(object, obmat);
-		mult_m4_m4m4(mat, mat, obmat);
-		mult_m4_m4m4(newmat, rot, mat);
+		mul_m4_m4m4(mat, mat, obmat);
+		mul_m4_m4m4(newmat, rot, mat);
 		BKE_object_apply_mat4(object, newmat, 0, 0);
 
 		/* make camera have positive z-coordinate */
 		if (object->loc[2] < 0) {
 			invert_m4(rot);
-			mult_m4_m4m4(newmat, rot, mat);
+			mul_m4_m4m4(newmat, rot, mat);
 			BKE_object_apply_mat4(object, newmat, 0, 0);
 		}
 	}