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.

9 files changed, 30 insertions, 30 deletions

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 3cd0efe6978..19a49c4344d 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -958,7 +958,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
 			// compute bone local mat
 			if (bone->parent) {
 				invert_m4_m4(ipar, parchan->pose_mat);
-				mult_m4_m4m4(mat, ipar, pchan->pose_mat);
+				mul_m4_m4m4(mat, ipar, pchan->pose_mat);
 			}
 			else
 				copy_m4_m4(mat, pchan->pose_mat);
@@ -972,13 +972,13 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
 				temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 				invert_m4(temp);
 
-				mult_m4_m4m4(mat, mat, temp);
+				mul_m4_m4m4(mat, mat, temp);
 
 				if (bone->parent) {
 					copy_m4_m4(temp, bone->parent->arm_mat);
 					temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 
-					mult_m4_m4m4(mat, temp, mat);
+					mul_m4_m4m4(mat, temp, mat);
 				}
 			}
 
@@ -1497,7 +1497,7 @@ void AnimationExporter::sample_animation(float *v, std::vector<float> &frames, i
 		// compute bone local mat
 		if (bone->parent) {
 			invert_m4_m4(ipar, parchan->pose_mat);
-			mult_m4_m4m4(mat, ipar, pchan->pose_mat);
+			mul_m4_m4m4(mat, ipar, pchan->pose_mat);
 		}
 		else
 			copy_m4_m4(mat, pchan->pose_mat);
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);
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 2d3dc979416..438421ccd14 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -204,7 +204,7 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene *sce,
 						copy_m4_m4(temp, bone->arm_mat);
 						temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 
-						mult_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv);
+						mul_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv);
 					}
 
 					se->writeNodes(*i, sce);
@@ -257,11 +257,11 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
 		/*bPoseChannel *parchan = BKE_pose_channel_find_name(ob_arm->pose, bone->parent->name);
 		float invpar[4][4];
 		invert_m4_m4(invpar, parchan->pose_mat);
-		mult_m4_m4m4(mat, invpar, pchan->pose_mat);*/
+		mul_m4_m4m4(mat, invpar, pchan->pose_mat);*/
 		
 		float invpar[4][4];
 		invert_m4_m4(invpar, bone->parent->arm_mat);
-		mult_m4_m4m4(mat, invpar, bone->arm_mat);
+		mul_m4_m4m4(mat, invpar, bone->arm_mat);
 
 	}
 	else {
@@ -281,13 +281,13 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
 		temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 		invert_m4(temp);
 
-		mult_m4_m4m4(mat, mat, temp);
+		mul_m4_m4m4(mat, mat, temp);
 
 		if (bone->parent) {
 			copy_m4_m4(temp, bone->parent->arm_mat);
 			temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 
-			mult_m4_m4m4(mat, temp, mat);
+			mul_m4_m4m4(mat, temp, mat);
 		}
 	}
 
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 901dd85a482..8791d94f44a 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -109,7 +109,7 @@ void ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBo
 
 		// get world-space
 		if (parent) {
-			mult_m4_m4m4(mat, parent_mat, obmat);
+			mul_m4_m4m4(mat, parent_mat, obmat);
 		}
 		else {
 			copy_m4_m4(mat, obmat);
@@ -486,10 +486,10 @@ void ArmatureImporter::set_pose(Object *ob_arm,  COLLADAFW::Node *root_node, con
 
 	// get world-space
 	if (parentname) {
-		mult_m4_m4m4(mat, parent_mat, obmat);
+		mul_m4_m4m4(mat, parent_mat, obmat);
 		bPoseChannel *parchan = BKE_pose_channel_find_name(ob_arm->pose, parentname);
 
-		mult_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat);
+		mul_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat);
 
 	}
 	else {
@@ -497,7 +497,7 @@ void ArmatureImporter::set_pose(Object *ob_arm,  COLLADAFW::Node *root_node, con
 		copy_m4_m4(mat, obmat);
 		float invObmat[4][4];
 		invert_m4_m4(invObmat, ob_arm->obmat);
-		mult_m4_m4m4(pchan->pose_mat, invObmat, mat);
+		mul_m4_m4m4(pchan->pose_mat, invObmat, mat);
 		
 	}
 
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index 71a16df3b26..4c6f71ff1a6 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -513,11 +513,11 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas
 				float temp[4][4];
 				unit_m4(temp);
 				copy_v3_v3(temp[3], pchan->bone->arm_mat[3]);
-				mult_m4_m4m4(world, ob_arm->obmat, temp);
+				mul_m4_m4m4(world, ob_arm->obmat, temp);
 			}
 			else {
 				// make world-space matrix, arm_mat is armature-space
-				mult_m4_m4m4(world, ob_arm->obmat, pchan->bone->arm_mat);
+				mul_m4_m4m4(world, ob_arm->obmat, pchan->bone->arm_mat);
 			}
 
 			invert_m4_m4(mat, world);
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 41bd561f86d..0abf413788f 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -406,7 +406,7 @@ Object *DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod
 				}
 			}
 			// calc new matrix and apply
-			mult_m4_m4m4(obn->obmat, obn->obmat, mat);
+			mul_m4_m4m4(obn->obmat, obn->obmat, mat);
 			BKE_object_apply_mat4(obn, obn->obmat, 0, 0);
 		}
 	}
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp
index e0ba77e2554..43faa15b4bb 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/collada/TransformReader.cpp
@@ -67,7 +67,7 @@ void TransformReader::get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::
 		}
 
 		copy_m4_m4(copy, mat);
-		mult_m4_m4m4(mat, copy, cur);
+		mul_m4_m4m4(mat, copy, cur);
 		
 		if (animation_map) {
 			// AnimationList that drives this Transformation
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index c530135bc4d..efefca86d3e 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -40,7 +40,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4],
 	if (parent_mat) {
 		float invpar[4][4];
 		invert_m4_m4(invpar, parent_mat);
-		mult_m4_m4m4(local, invpar, mat);
+		mul_m4_m4m4(local, invpar, mat);
 	}
 	else {
 		copy_m4_m4(local, mat);
@@ -82,7 +82,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B
 		// calculate local mat
 
 		invert_m4_m4(imat, ob->parent->obmat);
-		mult_m4_m4m4(mat, imat, tmat);
+		mul_m4_m4m4(mat, imat, tmat);
 
 		// done
 
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 66cef6dd20a..65d6a13dd18 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -102,7 +102,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
 		BKE_object_where_is_calc(sce, par);
 
 		// move child obmat into world space
-		mult_m4_m4m4(mat, par->obmat, ob->obmat);
+		mul_m4_m4m4(mat, par->obmat, ob->obmat);
 		copy_m4_m4(ob->obmat, mat);
 	}
 	
@@ -376,8 +376,8 @@ void bc_match_scale(std::vector<Object *> *objects_done,
 			++it) 
 	{
 		ob = *it;
-		mult_m4_m4m4(ob->obmat, size_mat4, ob->obmat);
-		mult_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat);
+		mul_m4_m4m4(ob->obmat, size_mat4, ob->obmat);
+		mul_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat);
 		BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
 	}