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

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index c51fb244eb6..30cb0200794 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1659,14 +1659,14 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	}
 	
 /* 2.5 setup matrices */
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);	/* need to be that way, for imat texture */
 	copy_m3_m4(nmat, ob->imat);
 	transpose_m3(nmat);
 
 	if (psys->flag & PSYS_USE_IMAT) {
 		/* psys->imat is the original emitter's inverse matrix, ob->obmat is the duplicated object's matrix */
-		mult_m4_m4m4(duplimat, ob->obmat, psys->imat);
+		mul_m4_m4m4(duplimat, ob->obmat, psys->imat);
 		use_duplimat = TRUE;
 	}
 
@@ -2108,7 +2108,7 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *UNUSED(me), int
 	float vec[3], hasize, mat[4][4], imat[3][3];
 	int a, ok, seed= ma->seed1;
 
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	copy_m3_m4(imat, ob->imat);
 
 	re->flag |= R_HALO;
@@ -2405,7 +2405,7 @@ static void init_render_mball(Render *re, ObjectRen *obr)
 	if (ob!=BKE_mball_basis_find(re->scene, ob))
 		return;
 
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);
 	copy_m3_m4(imat, ob->imat);
 	negative_scale = is_negative_m4(mat);
@@ -2800,7 +2800,7 @@ static void init_render_surf(Render *re, ObjectRen *obr, int timeoffset)
 	nu= cu->nurb.first;
 	if (nu==0) return;
 
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);
 
 	/* material array */
@@ -2870,7 +2870,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 	dl= disp.first;
 	if (dl==NULL) return;
 	
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);
 
 	/* local object -> world space transform for normals */
@@ -3324,7 +3324,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 
 	me= ob->data;
 
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);
 	copy_m3_m4(imat, ob->imat);
 	negative_scale= is_negative_m4(mat);
@@ -3748,7 +3748,7 @@ static void initshadowbuf(Render *re, LampRen *lar, float mat[4][4])
 	/* matrix: combination of inverse view and lampmat */
 	/* calculate again: the ortho-render has no correct viewinv */
 	invert_m4_m4(viewinv, re->viewmat);
-	mult_m4_m4m4(shb->viewmat, shb->winmat, viewinv);
+	mul_m4_m4m4(shb->viewmat, shb->winmat, viewinv);
 	
 	/* projection */
 	shb->d= lar->clipsta;
@@ -3826,7 +3826,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	BLI_addtail(&re->lampren, lar);
 	go->lampren= lar;
 
-	mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+	mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 	invert_m4_m4(ob->imat, mat);
 
 	copy_m3_m4(lar->mat, mat);
@@ -4569,7 +4569,7 @@ static void find_dupli_instances(Render *re, ObjectRen *obr)
 	float imat[4][4], obmat[4][4], obimat[4][4], nmat[3][3];
 	int first = 1;
 
-	mult_m4_m4m4(obmat, re->viewmat, obr->obmat);
+	mul_m4_m4m4(obmat, re->viewmat, obr->obmat);
 	invert_m4_m4(imat, obmat);
 
 	/* for objects instanced by dupliverts/faces/particles, we go over the
@@ -4582,7 +4582,7 @@ static void find_dupli_instances(Render *re, ObjectRen *obr)
 			/* compute difference between object matrix and
 			 * object matrix with dupli transform, in viewspace */
 			copy_m4_m4(obimat, obi->mat);
-			mult_m4_m4m4(obi->mat, obimat, imat);
+			mul_m4_m4m4(obi->mat, obimat, imat);
 
 			copy_m3_m4(nmat, obi->mat);
 			invert_m3_m3(obi->nmat, nmat);
@@ -4604,7 +4604,7 @@ static void assign_dupligroup_dupli(Render *re, ObjectInstanceRen *obi, ObjectRe
 {
 	float imat[4][4], obmat[4][4], obimat[4][4], nmat[3][3];
 
-	mult_m4_m4m4(obmat, re->viewmat, obr->obmat);
+	mul_m4_m4m4(obmat, re->viewmat, obr->obmat);
 	invert_m4_m4(imat, obmat);
 
 	obi->obr= obr;
@@ -4612,7 +4612,7 @@ static void assign_dupligroup_dupli(Render *re, ObjectInstanceRen *obi, ObjectRe
 	/* compute difference between object matrix and
 	 * object matrix with dupli transform, in viewspace */
 	copy_m4_m4(obimat, obi->mat);
-	mult_m4_m4m4(obi->mat, obimat, imat);
+	mul_m4_m4m4(obi->mat, obimat, imat);
 
 	copy_m3_m4(nmat, obi->mat);
 	invert_m3_m3(obi->nmat, nmat);
@@ -4814,7 +4814,7 @@ static void init_render_object(Render *re, Object *ob, Object *par, DupliObject
 	else if (render_object_type(ob->type))
 		add_render_object(re, ob, par, dob, timeoffset);
 	else {
-		mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+		mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 		invert_m4_m4(ob->imat, mat);
 	}
 	
@@ -5066,7 +5066,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 	 * See bug: [#28744] - campbell */
 	for (ob= re->main->object.first; ob; ob= ob->id.next) {
 		/* imat objects has to be done here, since displace can have texture using Object map-input */
-		mult_m4_m4m4(mat, re->viewmat, ob->obmat);
+		mul_m4_m4m4(mat, re->viewmat, ob->obmat);
 		invert_m4_m4(ob->imat_ren, mat);
 		copy_m4_m4(ob->imat, ob->imat_ren);
 		/* each object should only be rendered once */
@@ -5138,7 +5138,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 						 * this is a duplivert/face/particle, or it is a non-animated object in
 						 * a dupligroup that has already been created before */
 						if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, 0))) {
-							mult_m4_m4m4(mat, re->viewmat, dob->mat);
+							mul_m4_m4m4(mat, re->viewmat, dob->mat);
 														/* ob = particle system, use that layer */
 							obi= RE_addRenderInstance(re, NULL, obd, ob, dob->persistent_id[0], 0, mat, ob->lay); 
 
@@ -5166,7 +5166,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 						for (psys=obd->particlesystem.first; psys; psys=psys->next) {
 							if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, psysindex))) {
 								if (obi == NULL)
-									mult_m4_m4m4(mat, re->viewmat, dob->mat);
+									mul_m4_m4m4(mat, re->viewmat, dob->mat);
 								obi= RE_addRenderInstance(re, NULL, obd, ob, dob->persistent_id[0], psysindex++, mat, obd->lay);
 
 								set_dupli_tex_mat(re, obi, dob);
@@ -5388,7 +5388,7 @@ void RE_DataBase_IncrementalView(Render *re, float viewmat[4][4], int restore)
 	invert_m4_m4(oldviewinv, re->viewmat_orig);
 	
 	/* we have to correct for the already rotated vertexcoords */
-	mult_m4_m4m4(tmat, viewmat, oldviewinv);
+	mul_m4_m4m4(tmat, viewmat, oldviewinv);
 	
 	copy_m4_m4(re->viewmat, viewmat);
 	invert_m4_m4(re->viewinv, re->viewmat);
@@ -5546,7 +5546,7 @@ static float *calculate_strandsurface_speedvectors(Render *re, ObjectInstanceRen
 		int a;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(winmat, re->winmat, obi->mat);
+			mul_m4_m4m4(winmat, re->winmat, obi->mat);
 		else
 			copy_m4_m4(winmat, re->winmat);
 
@@ -5583,7 +5583,7 @@ static void calculate_speedvectors(Render *re, ObjectInstanceRen *obi, float *ve
 	int a, *face, *index;
 
 	if (obi->flag & R_TRANSFORMED)
-		mult_m4_m4m4(winmat, re->winmat, obi->mat);
+		mul_m4_m4m4(winmat, re->winmat, obi->mat);
 	else
 		copy_m4_m4(winmat, re->winmat);
 
@@ -5677,7 +5677,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
 	velarray = fss->meshVelocities;
 
 	if (obi->flag & R_TRANSFORMED)
-		mult_m4_m4m4(winmat, re->winmat, obi->mat);
+		mul_m4_m4m4(winmat, re->winmat, obi->mat);
 	else
 		copy_m4_m4(winmat, re->winmat);
 	
@@ -5766,7 +5766,7 @@ static void copy_dbase_object_vectors(Render *re, ListBase *lb)
 			vec= obilb->vectors= MEM_mallocN(2*sizeof(float)*totvector, "vector array");
 
 			if (obi->flag & R_TRANSFORMED)
-				mult_m4_m4m4(winmat, re->winmat, obi->mat);
+				mul_m4_m4m4(winmat, re->winmat, obi->mat);
 			else
 				copy_m4_m4(winmat, re->winmat);
 
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 419c3d8ee23..4fba67cf711 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -257,7 +257,7 @@ static void env_set_imats(Render *re)
 	
 	base = re->scene->base.first;
 	while (base) {
-		mult_m4_m4m4(mat, re->viewmat, base->object->obmat);
+		mul_m4_m4m4(mat, re->viewmat, base->object->obmat);
 		invert_m4_m4(base->object->imat, mat);
 		
 		base = base->next;
@@ -294,7 +294,7 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate)
 		/* append or set matrix depending on dupli */
 		if (obi->flag & R_DUPLI_TRANSFORMED) {
 			copy_m4_m4(tmpmat, obi->mat);
-			mult_m4_m4m4(obi->mat, tmat, tmpmat);
+			mul_m4_m4m4(obi->mat, tmat, tmpmat);
 		}
 		else if (do_rotate == 1)
 			copy_m4_m4(obi->mat, tmat);
@@ -329,9 +329,9 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate)
 		
 		/* copy from add_render_lamp */
 		if (do_rotate == 1)
-			mult_m4_m4m4(tmpmat, re->viewmat, go->ob->obmat);
+			mul_m4_m4m4(tmpmat, re->viewmat, go->ob->obmat);
 		else
-			mult_m4_m4m4(tmpmat, re->viewmat_orig, go->ob->obmat);
+			mul_m4_m4m4(tmpmat, re->viewmat_orig, go->ob->obmat);
 		invert_m4_m4(go->ob->imat, tmpmat);
 		
 		copy_m3_m4(lar->mat, tmpmat);
@@ -362,10 +362,10 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate)
 		
 			if (lar->shb) {
 				if (do_rotate == 1) {
-					mult_m4_m4m4(smat, lar->shb->viewmat, mat_inverse);
-					mult_m4_m4m4(lar->shb->persmat, lar->shb->winmat, smat);
+					mul_m4_m4m4(smat, lar->shb->viewmat, mat_inverse);
+					mul_m4_m4m4(lar->shb->persmat, lar->shb->winmat, smat);
 				}
-				else mult_m4_m4m4(lar->shb->persmat, lar->shb->winmat, lar->shb->viewmat);
+				else mul_m4_m4m4(lar->shb->persmat, lar->shb->winmat, lar->shb->viewmat);
 			}
 		}
 	}
@@ -460,7 +460,7 @@ static void render_envmap(Render *re, EnvMap *env)
 	normalize_m4(orthmat);
 	
 	/* need imat later for texture imat */
-	mult_m4_m4m4(mat, re->viewmat, orthmat);
+	mul_m4_m4m4(mat, re->viewmat, orthmat);
 	invert_m4_m4(tmat, mat);
 	copy_m3_m4(env->obimat, tmat);
 
@@ -479,7 +479,7 @@ static void render_envmap(Render *re, EnvMap *env)
 		copy_m4_m4(envre->viewinv, tmat);
 		
 		/* we have to correct for the already rotated vertexcoords */
-		mult_m4_m4m4(tmat, envre->viewmat, oldviewinv);
+		mul_m4_m4m4(tmat, envre->viewmat, oldviewinv);
 		invert_m4_m4(env->imat, tmat);
 		
 		env_rotate_scene(envre, tmat, 1);
@@ -561,7 +561,7 @@ void make_envmaps(Render *re)
 							normalize_m4(orthmat);
 							
 							/* need imat later for texture imat */
-							mult_m4_m4m4(mat, re->viewmat, orthmat);
+							mul_m4_m4m4(mat, re->viewmat, orthmat);
 							invert_m4_m4(tmat, mat);
 							copy_m3_m4(env->obimat, tmat);
 						}
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 82428f792bb..e86ae7ea063 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -119,7 +119,7 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	/* init everything */
 	if (!psys || !ob || !pd) return;
 
-	mult_m4_m4m4(obview, ob->obmat, re->viewinv);
+	mul_m4_m4m4(obview, ob->obmat, re->viewinv);
 	
 	/* Just to create a valid rendering context for particles */
 	psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0);
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 837dfb3d8dd..a444588d627 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -2046,7 +2046,7 @@ static int ntap_bump_compute(NTapBump *ntap_bump, ShadeInput *shi, MTex *mtex, T
 		if ( mtex->texflag & MTEX_BUMP_OBJECTSPACE ) {
 			/* TODO: these calculations happen for every pixel!
 			 *	-> move to shi->obi */
-			mult_m4_m4m4(tmp, R.viewmat, shi->obr->ob->obmat);
+			mul_m4_m4m4(tmp, R.viewmat, shi->obr->ob->obmat);
 			copy_m3_m4(obj2view, tmp); /* use only upper left 3x3 matrix */
 			invert_m3_m3(view2obj, obj2view);
 
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 7d463316a98..7cb37ce5aa6 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -645,7 +645,7 @@ static void shadowbuf_autoclip(Render *re, LampRen *lar)
 		obr= obi->obr;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(obviewmat, viewmat, obi->mat);
+			mul_m4_m4m4(obviewmat, viewmat, obi->mat);
 		else
 			copy_m4_m4(obviewmat, viewmat);
 
@@ -782,7 +782,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
 	wsize= shb->pixsize*(shb->size/2.0f);
 	
 	perspective_m4(shb->winmat, -wsize, wsize, -wsize, wsize, shb->d, shb->clipend);
-	mult_m4_m4m4(shb->persmat, shb->winmat, shb->viewmat);
+	mul_m4_m4m4(shb->persmat, shb->winmat, shb->viewmat);
 
 	if (ELEM3(lar->buftype, LA_SHADBUF_REGULAR, LA_SHADBUF_HALFWAY, LA_SHADBUF_DEEP)) {
 		shb->totbuf= lar->buffers;
@@ -1995,7 +1995,7 @@ static void isb_bsp_fillfaces(Render *re, LampRen *lar, ISBBranch *root)
 		obr= obi->obr;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(winmat, shb->persmat, obi->mat);
+			mul_m4_m4m4(winmat, shb->persmat, obi->mat);
 		else
 			copy_m4_m4(winmat, shb->persmat);
 
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index bf0087d0292..eb9e72fedfa 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -1144,7 +1144,7 @@ void shade_input_set_shade_texco(ShadeInput *shi)
 
 					zbuf_make_winmat(&R, winmat);
 					if (shi->obi->flag & R_TRANSFORMED)
-						mult_m4_m4m4(obwinmat, winmat, obi->mat);
+						mul_m4_m4m4(obwinmat, winmat, obi->mat);
 					else
 						copy_m4_m4(obwinmat, winmat);
 
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index 9bfdf73f367..3485f2b1ccb 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -858,7 +858,7 @@ int zbuffer_strands_abuf(Render *re, RenderPart *pa, APixstrand *apixbuf, ListBa
 
 		/* compute matrix and try clipping whole object */
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(obwinmat, winmat, obi->mat);
+			mul_m4_m4m4(obwinmat, winmat, obi->mat);
 		else
 			copy_m4_m4(obwinmat, winmat);
 
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index fe4cff76093..3915d6bdd4b 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -243,7 +243,7 @@ static float metadensity(Object *ob, const float co[3])
 	
 	/* transform co to meta-element */
 	float tco[3] = {co[0], co[1], co[2]};
-	mult_m4_m4m4(mat, R.viewmat, ob->obmat);
+	mul_m4_m4m4(mat, R.viewmat, ob->obmat);
 	invert_m4_m4(imat, mat);
 	mul_m4_v3(imat, tco);
 	
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index cc9717bd9d2..3b4ad7c91af 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -1837,7 +1837,7 @@ void zbuf_make_winmat(Render *re, float winmat[4][4])
 		panomat[2][0]= -re->panosi;
 		panomat[2][2]= re->panoco;
 
-		mult_m4_m4m4(winmat, re->winmat, panomat);
+		mul_m4_m4m4(winmat, re->winmat, panomat);
 	}
 	else
 		copy_m4_m4(winmat, re->winmat);
@@ -2162,7 +2162,7 @@ void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart *
 				continue;
 			
 			if (obi->flag & R_TRANSFORMED)
-				mult_m4_m4m4(obwinmat, winmat, obi->mat);
+				mul_m4_m4m4(obwinmat, winmat, obi->mat);
 			else
 				copy_m4_m4(obwinmat, winmat);
 
@@ -2342,7 +2342,7 @@ void zbuffer_shadow(Render *re, float winmat[4][4], LampRen *lar, int *rectz, in
 			continue;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(obwinmat, winmat, obi->mat);
+			mul_m4_m4m4(obwinmat, winmat, obi->mat);
 		else
 			copy_m4_m4(obwinmat, winmat);
 
@@ -2582,7 +2582,7 @@ void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(vo
 			continue;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(obwinmat, winmat, obi->mat);
+			mul_m4_m4m4(obwinmat, winmat, obi->mat);
 		else
 			copy_m4_m4(obwinmat, winmat);
 
@@ -3325,7 +3325,7 @@ static int zbuffer_abuf(Render *re, RenderPart *pa, APixstr *APixbuf, ListBase *
 			continue;
 
 		if (obi->flag & R_TRANSFORMED)
-			mult_m4_m4m4(obwinmat, winmat, obi->mat);
+			mul_m4_m4m4(obwinmat, winmat, obi->mat);
 		else
 			copy_m4_m4(obwinmat, winmat);