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, 8 insertions, 8 deletions

diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index e36a9873574..643b2cdc2b0 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -788,7 +788,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
 
 			// calc M
 			calc_joint_parent_mat_rest(par, NULL, root, node);
-			mult_m4_m4m4(temp, par, matfra);
+			mul_m4_m4m4(temp, par, matfra);
 
 			// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
 
@@ -1194,7 +1194,7 @@ void AnimationImporter::add_bone_animation_sampled(Object *ob, std::vector<FCurv
 
 		// calc M
 		calc_joint_parent_mat_rest(par, NULL, root, node);
-		mult_m4_m4m4(temp, par, matfra);
+		mul_m4_m4m4(temp, par, matfra);
 
 		// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
 
@@ -1529,7 +1529,7 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 
 			// calc M
 			calc_joint_parent_mat_rest(par, NULL, root, node);
-			mult_m4_m4m4(temp, par, matfra);
+			mul_m4_m4m4(temp, par, matfra);
 
 			// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
 
@@ -1683,7 +1683,7 @@ void AnimationImporter::evaluate_transform_at_frame(float mat[4][4], COLLADAFW::
 		float temp[4][4];
 		copy_m4_m4(temp, mat);
 
-		mult_m4_m4m4(mat, temp, m);
+		mul_m4_m4m4(mat, temp, m);
 	}
 }
 
@@ -1847,7 +1847,7 @@ void AnimationImporter::get_joint_rest_mat(float mat[4][4], COLLADAFW::Node *roo
 
 		calc_joint_parent_mat_rest(par, NULL, root, node);
 		get_node_mat(m, node, NULL, NULL);
-		mult_m4_m4m4(mat, par, m);
+		mul_m4_m4m4(mat, par, m);
 	}
 }
 
@@ -1866,7 +1866,7 @@ bool AnimationImporter::calc_joint_parent_mat_rest(float mat[4][4], float par[4]
 		if (par) {
 			float temp[4][4];
 			get_node_mat(temp, node, NULL, NULL);
-			mult_m4_m4m4(m, par, temp);
+			mul_m4_m4m4(m, par, temp);
 		}
 		else {
 			get_node_mat(m, node, NULL, NULL);
@@ -1904,7 +1904,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No
 			float temp[4][4], ipar[4][4];
 			invert_m4_m4(ipar, par_job->obmat);
 			copy_m4_m4(temp, mat);
-			mult_m4_m4m4(mat, ipar, temp);
+			mul_m4_m4m4(mat, ipar, temp);
 		}
 
 		TransformBase::decompose(mat, job->loc, NULL, job->quat, job->size);
@@ -1937,7 +1937,7 @@ bool AnimationImporter::evaluate_joint_world_transform_at_frame(float mat[4][4],
 	if (par) {
 		float temp[4][4];
 		evaluate_transform_at_frame(temp, node, node == end ? fra : 0.0f);
-		mult_m4_m4m4(m, par, temp);
+		mul_m4_m4m4(m, par, temp);
 	}
 	else {
 		evaluate_transform_at_frame(m, node, node == end ? fra : 0.0f);