Math Lib

* Convert all code to use new functions.
* Branch maintainers may want to skip this commit, and run this
  conversion script instead, if they use a lot of math functions
  in new code:
  http://www.pasteall.org/9052/python

10 files changed, 288 insertions, 288 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 0042ad9483b..5d94fb32438 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -32,7 +32,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_heap.h"
 #include "BLI_edgehash.h"
 #include "BLI_editVert.h"
@@ -453,7 +453,7 @@ int minmax_tface(Scene *scene, float *min, float *max)
 	me= get_mesh(ob);
 	if(me==0 || me->mtface==0) return ok;
 	
-	Mat3CpyMat4(bmat, ob->obmat);
+	copy_m3_m4(bmat, ob->obmat);
 
 	mv= me->mvert;
 	mf= me->mface;
@@ -463,24 +463,24 @@ int minmax_tface(Scene *scene, float *min, float *max)
 			continue;
 
 		VECCOPY(vec, (mv+mf->v1)->co);
-		Mat3MulVecfl(bmat, vec);
-		VecAddf(vec, vec, ob->obmat[3]);
+		mul_m3_v3(bmat, vec);
+		add_v3_v3v3(vec, vec, ob->obmat[3]);
 		DO_MINMAX(vec, min, max);		
 
 		VECCOPY(vec, (mv+mf->v2)->co);
-		Mat3MulVecfl(bmat, vec);
-		VecAddf(vec, vec, ob->obmat[3]);
+		mul_m3_v3(bmat, vec);
+		add_v3_v3v3(vec, vec, ob->obmat[3]);
 		DO_MINMAX(vec, min, max);		
 
 		VECCOPY(vec, (mv+mf->v3)->co);
-		Mat3MulVecfl(bmat, vec);
-		VecAddf(vec, vec, ob->obmat[3]);
+		mul_m3_v3(bmat, vec);
+		add_v3_v3v3(vec, vec, ob->obmat[3]);
 		DO_MINMAX(vec, min, max);		
 
 		if (mf->v4) {
 			VECCOPY(vec, (mv+mf->v4)->co);
-			Mat3MulVecfl(bmat, vec);
-			VecAddf(vec, vec, ob->obmat[3]);
+			mul_m3_v3(bmat, vec);
+			add_v3_v3v3(vec, vec, ob->obmat[3]);
 			DO_MINMAX(vec, min, max);
 		}
 		ok= 1;
@@ -500,11 +500,11 @@ static float edgetag_cut_cost(EditMesh *em, int e1, int e2, int vert)
 	EditVert *v2 = EM_get_vert_for_index( (eed2->v1->tmp.l == vert)? eed2->v2->tmp.l: eed2->v1->tmp.l );
 	float cost, d1[3], d2[3];
 
-	cost = VecLenf(v1->co, v->co);
-	cost += VecLenf(v->co, v2->co);
+	cost = len_v3v3(v1->co, v->co);
+	cost += len_v3v3(v->co, v2->co);
 
-	VecSubf(d1, v->co, v1->co);
-	VecSubf(d2, v2->co, v->co);
+	sub_v3_v3v3(d1, v->co, v1->co);
+	sub_v3_v3v3(d2, v2->co, v->co);
 
 	cost = cost + 0.5f*cost*(2.0f - fabs(d1[0]*d2[0] + d1[1]*d2[1] + d1[2]*d2[2]));
 
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 81d565a9ba4..bdb1df3b5c1 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -49,7 +49,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_dynstr.h"
 #include "BLI_rand.h"
@@ -411,12 +411,12 @@ EditFace *addfacelist(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, Ed
 	em->totface++;
 	
 	if(efa->v4) {
-		CalcNormFloat4(efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co, efa->n);
-		CalcCent4f(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+		normal_quad_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+		cent_quad_v3(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
 	}
 	else {
-		CalcNormFloat(efa->v1->co, efa->v2->co, efa->v3->co, efa->n);
-		CalcCent3f(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co);
+		normal_tri_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co);
+		cent_tri_v3(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co);
 	}
 
 	return efa;
@@ -614,13 +614,13 @@ static void edge_normal_compare(EditEdge *eed, EditFace *efa1)
 	inp= efa1->n[0]*efa2->n[0] + efa1->n[1]*efa2->n[1] + efa1->n[2]*efa2->n[2];
 	if(inp<0.999 && inp >-0.999) eed->f2= 1;
 		
-	if(efa1->v4) CalcCent4f(cent1, efa1->v1->co, efa1->v2->co, efa1->v3->co, efa1->v4->co);
-	else CalcCent3f(cent1, efa1->v1->co, efa1->v2->co, efa1->v3->co);
-	if(efa2->v4) CalcCent4f(cent2, efa2->v1->co, efa2->v2->co, efa2->v3->co, efa2->v4->co);
-	else CalcCent3f(cent2, efa2->v1->co, efa2->v2->co, efa2->v3->co);
+	if(efa1->v4) cent_quad_v3(cent1, efa1->v1->co, efa1->v2->co, efa1->v3->co, efa1->v4->co);
+	else cent_tri_v3(cent1, efa1->v1->co, efa1->v2->co, efa1->v3->co);
+	if(efa2->v4) cent_quad_v3(cent2, efa2->v1->co, efa2->v2->co, efa2->v3->co, efa2->v4->co);
+	else cent_tri_v3(cent2, efa2->v1->co, efa2->v2->co, efa2->v3->co);
 	
-	VecSubf(cent1, cent2, cent1);
-	Normalize(cent1);
+	sub_v3_v3v3(cent1, cent2, cent1);
+	normalize_v3(cent1);
 	inp= cent1[0]*efa1->n[0] + cent1[1]*efa1->n[1] + cent1[2]*efa1->n[2]; 
 
 	if(inp < -0.001 ) eed->f1= 1;
@@ -1004,7 +1004,7 @@ void load_editMesh(Scene *scene, Object *ob)
 		
 		/* vertex normal */
 		VECCOPY(nor, eve->no);
-		VecMulf(nor, 32767.0);
+		mul_v3_fl(nor, 32767.0);
 		VECCOPY(mvert->no, nor);
 
 		/* note: it used to remove me->dvert when it was not in use, cancelled
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 5905b2021ea..fbe72a54e70 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -49,7 +49,7 @@
 #include "RNA_access.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 
 #include "BKE_context.h"
@@ -147,40 +147,40 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
 		done= 0;
 		for(eed= vc.em->edges.first; eed; eed= eed->next) {
 			if( (eed->v1->f & SELECT)+(eed->v2->f & SELECT) == SELECT ) {
-				if(eed->v1->f & SELECT) VecSubf(vec, eed->v1->co, eed->v2->co);
-				else VecSubf(vec, eed->v2->co, eed->v1->co);
-				VecAddf(nor, nor, vec);
+				if(eed->v1->f & SELECT) sub_v3_v3v3(vec, eed->v1->co, eed->v2->co);
+				else sub_v3_v3v3(vec, eed->v2->co, eed->v1->co);
+				add_v3_v3v3(nor, nor, vec);
 				done= 1;
 			}
 		}
-		if(done) Normalize(nor);
+		if(done) normalize_v3(nor);
 		
 		/* center */
-		VecAddf(cent, min, max);
-		VecMulf(cent, 0.5f);
+		add_v3_v3v3(cent, min, max);
+		mul_v3_fl(cent, 0.5f);
 		VECCOPY(min, cent);
 		
-		Mat4MulVecfl(vc.obedit->obmat, min);	// view space
+		mul_m4_v3(vc.obedit->obmat, min);	// view space
 		view3d_get_view_aligned_coordinate(&vc, min, event->mval);
-		Mat4Invert(vc.obedit->imat, vc.obedit->obmat); 
-		Mat4MulVecfl(vc.obedit->imat, min); // back in object space
+		invert_m4_m4(vc.obedit->imat, vc.obedit->obmat); 
+		mul_m4_v3(vc.obedit->imat, min); // back in object space
 		
-		VecSubf(min, min, cent);
+		sub_v3_v3v3(min, min, cent);
 		
 		/* calculate rotation */
-		Mat3One(mat);
+		unit_m3(mat);
 		if(done) {
 			float dot;
 			
 			VECCOPY(vec, min);
-			Normalize(vec);
+			normalize_v3(vec);
 			dot= INPR(vec, nor);
 
 			if( fabs(dot)<0.999) {
 				float cross[3], si, q1[4];
 				
-				Crossf(cross, nor, vec);
-				Normalize(cross);
+				cross_v3_v3v3(cross, nor, vec);
+				normalize_v3(cross);
 				dot= 0.5f*saacos(dot);
 				si= (float)sin(dot);
 				q1[0]= (float)cos(dot);
@@ -188,7 +188,7 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
 				q1[2]= cross[1]*si;
 				q1[3]= cross[2]*si;
 				
-				QuatToMat3(q1, mat);
+				quat_to_mat3( mat,q1);
 			}
 		}
 		
@@ -207,12 +207,12 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
 		
 		eve= addvertlist(vc.em, 0, NULL);
 
-		Mat3CpyMat4(mat, vc.obedit->obmat);
-		Mat3Inv(imat, mat);
+		copy_m3_m4(mat, vc.obedit->obmat);
+		invert_m3_m3(imat, mat);
 		
 		VECCOPY(eve->co, min);
-		Mat3MulVecfl(imat, eve->co);
-		VecSubf(eve->co, eve->co, vc.obedit->obmat[3]);
+		mul_m3_v3(imat, eve->co);
+		sub_v3_v3v3(eve->co, eve->co, vc.obedit->obmat[3]);
 		
 		eve->f= SELECT;
 	}
@@ -1011,7 +1011,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 			vec[0]= dia*phi;
 			vec[1]= - dia;
 			vec[2]= 0.0f;
-			Mat4MulVecfl(mat,vec);
+			mul_m4_v3(mat,vec);
 			eve= addvertlist(em, vec, NULL);
 			eve->f= 1+2+4;
 			if (a) {
@@ -1022,7 +1022,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		/* extrude and translate */
 		vec[0]= vec[2]= 0.0;
 		vec[1]= dia*phid;
-		Mat4Mul3Vecfl(mat, vec);
+		mul_mat3_m4_v3(mat, vec);
 		
 		for(a=0;a<seg-1;a++) {
 			extrudeflag_vert(obedit, em, 2, nor);	// nor unused
@@ -1057,7 +1057,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		q[0]= cos(phi);
 		q[3]= sin(phi);
 		q[1]=q[2]= 0;
-		QuatToMat3(q, cmat);
+		quat_to_mat3( cmat,q);
 		
 		for(a=0; a<seg; a++) {
 			extrudeflag_vert(obedit, em, 2, nor); // nor unused
@@ -1070,7 +1070,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		eve= em->verts.first;
 		while(eve) {
 			if(eve->f & SELECT) {
-				Mat4MulVecfl(mat,eve->co);
+				mul_m4_v3(mat,eve->co);
 			}
 			eve= eve->next;
 		}
@@ -1111,7 +1111,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 			eve= em->verts.first;
 			while(eve) {
 				if(eve->f & 2) {
-					Mat4MulVecfl(mat,eve->co);
+					mul_m4_v3(mat,eve->co);
 				}
 				eve= eve->next;
 			}
@@ -1150,7 +1150,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 			/* and now do imat */
 			for(eve= em->verts.first; eve; eve= eve->next) {
 				if(eve->f & SELECT) {
-					Mat4MulVecfl(mat,eve->co);
+					mul_m4_v3(mat,eve->co);
 				}
 			}
 			recalc_editnormals(em);
@@ -1170,7 +1170,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 				vec[1]= dia*cos(phi);
 				vec[2]= b?depth:-depth;
 				
-				Mat4MulVecfl(mat, vec);
+				mul_m4_v3(mat, vec);
 				eve= addvertlist(em, vec, NULL);
 				eve->f= SELECT;
 				if(a==0) {
@@ -1187,12 +1187,12 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		if(type == PRIM_CONE || (fill && !ELEM(type, PRIM_PLANE, PRIM_CUBE))) {
 			vec[0]= vec[1]= 0.0f;
 			vec[2]= type==PRIM_CONE ? depth : -depth;
-			Mat4MulVecfl(mat, vec);
+			mul_m4_v3(mat, vec);
 			vdown= addvertlist(em, vec, NULL);
 			if((ext || type==PRIM_CONE) && fill) {
 				vec[0]= vec[1]= 0.0f;
 				vec[2]= type==PRIM_CONE ? -depth : depth;
-				Mat4MulVecfl(mat,vec);
+				mul_m4_v3(mat,vec);
 				vtop= addvertlist(em, vec, NULL);
 			}
 		} else {
@@ -1281,25 +1281,25 @@ static float new_primitive_matrix(bContext *C, int view_align, float primmat[][4
 	RegionView3D *rv3d= ED_view3d_context_rv3d(C);
 	float *curs, mat[3][3], vmat[3][3], cmat[3][3], imat[3][3];
 	
-	Mat4One(primmat);
+	unit_m4(primmat);
 	
 	if(rv3d && view_align) {
-		Mat3CpyMat4(vmat, rv3d->viewmat);
+		copy_m3_m4(vmat, rv3d->viewmat);
 	} else
-		Mat3One(vmat);
+		unit_m3(vmat);
 	
 	/* inverse transform for view and object */
-	Mat3CpyMat4(mat, obedit->obmat);
-	Mat3MulMat3(cmat, vmat, mat);
-	Mat3Inv(imat, cmat);
-	Mat4CpyMat3(primmat, imat);
+	copy_m3_m4(mat, obedit->obmat);
+	mul_m3_m3m3(cmat, vmat, mat);
+	invert_m3_m3(imat, cmat);
+	copy_m4_m3(primmat, imat);
 
 	/* center */
 	curs= give_cursor(scene, v3d);
 	VECCOPY(primmat[3], curs);
 	VECSUB(primmat[3], primmat[3], obedit->obmat[3]);
-	Mat3Inv(imat, mat);
-	Mat3MulVecfl(imat, primmat[3]);
+	invert_m3_m3(imat, mat);
+	mul_m3_v3(imat, primmat[3]);
 	
 	if(v3d) return v3d->grid;
 	return 1.0f;
diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index e1b63022dd4..544dd790dc8 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -47,7 +47,7 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 
 #include "BKE_customdata.h"
@@ -272,14 +272,14 @@ void EM_editselection_center(float *center, EditSelection *ese)
 {
 	if (ese->type==EDITVERT) {
 		EditVert *eve= ese->data;
-		VecCopyf(center, eve->co);
+		copy_v3_v3(center, eve->co);
 	} else if (ese->type==EDITEDGE) {
 		EditEdge *eed= ese->data;
-		VecAddf(center, eed->v1->co, eed->v2->co);
-		VecMulf(center, 0.5);
+		add_v3_v3v3(center, eed->v1->co, eed->v2->co);
+		mul_v3_fl(center, 0.5);
 	} else if (ese->type==EDITFACE) {
 		EditFace *efa= ese->data;
-		VecCopyf(center, efa->cent);
+		copy_v3_v3(center, efa->cent);
 	}
 }
 
@@ -287,26 +287,26 @@ void EM_editselection_normal(float *normal, EditSelection *ese)
 {
 	if (ese->type==EDITVERT) {
 		EditVert *eve= ese->data;
-		VecCopyf(normal, eve->no);
+		copy_v3_v3(normal, eve->no);
 	} else if (ese->type==EDITEDGE) {
 		EditEdge *eed= ese->data;
 		float plane[3]; /* need a plane to correct the normal */
 		float vec[3]; /* temp vec storage */
 		
-		VecAddf(normal, eed->v1->no, eed->v2->no);
-		VecSubf(plane, eed->v2->co, eed->v1->co);
+		add_v3_v3v3(normal, eed->v1->no, eed->v2->no);
+		sub_v3_v3v3(plane, eed->v2->co, eed->v1->co);
 		
 		/* the 2 vertex normals will be close but not at rightangles to the edge
 		for rotate about edge we want them to be at right angles, so we need to
 		do some extra colculation to correct the vert normals,
 		we need the plane for this */
-		Crossf(vec, normal, plane);
-		Crossf(normal, plane, vec); 
-		Normalize(normal);
+		cross_v3_v3v3(vec, normal, plane);
+		cross_v3_v3v3(normal, plane, vec); 
+		normalize_v3(normal);
 		
 	} else if (ese->type==EDITFACE) {
 		EditFace *efa= ese->data;
-		VecCopyf(normal, efa->n);
+		copy_v3_v3(normal, efa->n);
 	}
 }
 
@@ -321,7 +321,7 @@ void EM_editselection_plane(float *plane, EditSelection *ese)
 		
 		if (ese->prev) { /*use previously selected data to make a usefull vertex plane */
 			EM_editselection_center(vec, ese->prev);
-			VecSubf(plane, vec, eve->co);
+			sub_v3_v3v3(plane, vec, eve->co);
 		} else {
 			/* make a fake  plane thats at rightangles to the normal
 			we cant make a crossvec from a vec thats the same as the vec
@@ -330,7 +330,7 @@ void EM_editselection_plane(float *plane, EditSelection *ese)
 			if (eve->no[0]<0.5)			vec[0]=1;
 			else if (eve->no[1]<0.5)	vec[1]=1;
 			else						vec[2]=1;
-			Crossf(plane, eve->no, vec);
+			cross_v3_v3v3(plane, eve->no, vec);
 		}
 	} else if (ese->type==EDITEDGE) {
 		EditEdge *eed= ese->data;
@@ -341,41 +341,41 @@ void EM_editselection_plane(float *plane, EditSelection *ese)
 		(running along the edge).. to flip less often.
 		at least its more pradictable */
 		if (eed->v2->co[1] > eed->v1->co[1]) /*check which to do first */
-			VecSubf(plane, eed->v2->co, eed->v1->co);
+			sub_v3_v3v3(plane, eed->v2->co, eed->v1->co);
 		else
-			VecSubf(plane, eed->v1->co, eed->v2->co);
+			sub_v3_v3v3(plane, eed->v1->co, eed->v2->co);
 		
 	} else if (ese->type==EDITFACE) {
 		EditFace *efa= ese->data;
 		float vec[3];
 		if (efa->v4) { /*if its a quad- set the plane along the 2 longest edges.*/
 			float vecA[3], vecB[3];
-			VecSubf(vecA, efa->v4->co, efa->v3->co);
-			VecSubf(vecB, efa->v1->co, efa->v2->co);
-			VecAddf(plane, vecA, vecB);
+			sub_v3_v3v3(vecA, efa->v4->co, efa->v3->co);
+			sub_v3_v3v3(vecB, efa->v1->co, efa->v2->co);
+			add_v3_v3v3(plane, vecA, vecB);
 			
-			VecSubf(vecA, efa->v1->co, efa->v4->co);
-			VecSubf(vecB, efa->v2->co, efa->v3->co);
-			VecAddf(vec, vecA, vecB);						
+			sub_v3_v3v3(vecA, efa->v1->co, efa->v4->co);
+			sub_v3_v3v3(vecB, efa->v2->co, efa->v3->co);
+			add_v3_v3v3(vec, vecA, vecB);						
 			/*use the biggest edge length*/
 			if (plane[0]*plane[0]+plane[1]*plane[1]+plane[2]*plane[2] < vec[0]*vec[0]+vec[1]*vec[1]+vec[2]*vec[2])
-				VecCopyf(plane, vec);
+				copy_v3_v3(plane, vec);
 		} else {
 			/*start with v1-2 */
-			VecSubf(plane, efa->v1->co, efa->v2->co);
+			sub_v3_v3v3(plane, efa->v1->co, efa->v2->co);
 			
 			/*test the edge between v2-3, use if longer */
-			VecSubf(vec, efa->v2->co, efa->v3->co);
+			sub_v3_v3v3(vec, efa->v2->co, efa->v3->co);
 			if (plane[0]*plane[0]+plane[1]*plane[1]+plane[2]*plane[2] < vec[0]*vec[0]+vec[1]*vec[1]+vec[2]*vec[2])
-				VecCopyf(plane, vec);
+				copy_v3_v3(plane, vec);
 			
 			/*test the edge between v1-3, use if longer */
-			VecSubf(vec, efa->v3->co, efa->v1->co);
+			sub_v3_v3v3(vec, efa->v3->co, efa->v1->co);
 			if (plane[0]*plane[0]+plane[1]*plane[1]+plane[2]*plane[2] < vec[0]*vec[0]+vec[1]*vec[1]+vec[2]*vec[2])
-				VecCopyf(plane, vec);
+				copy_v3_v3(plane, vec);
 		}
 	}
-	Normalize(plane);
+	normalize_v3(plane);
 }
 
 
@@ -908,9 +908,9 @@ void EM_free_data_layer(EditMesh *em, CustomData *data, int type)
 static void add_normal_aligned(float *nor, float *add)
 {
 	if( INPR(nor, add) < -0.9999f)
-		VecSubf(nor, nor, add);
+		sub_v3_v3v3(nor, nor, add);
 	else
-		VecAddf(nor, nor, add);
+		add_v3_v3v3(nor, nor, add);
 }
 
 static void set_edge_directions_f2(EditMesh *em, int val)
@@ -1097,7 +1097,7 @@ short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor)
 			}
 		}
 	}
-	Normalize(nor);
+	normalize_v3(nor);
 	
 	/* set correct selection */
 	EM_clear_flag_all(em, SELECT);
@@ -1216,20 +1216,20 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short flag, float *n
 				float mtx[4][4];
 				if (mmd->mirror_ob) {
 					float imtx[4][4];
-					Mat4Invert(imtx, mmd->mirror_ob->obmat);
-					Mat4MulMat4(mtx, obedit->obmat, imtx);
+					invert_m4_m4(imtx, mmd->mirror_ob->obmat);
+					mul_m4_m4m4(mtx, obedit->obmat, imtx);
 				}
 
 				for (eed= em->edges.first; eed; eed= eed->next) {
 					if(eed->f2 == 1) {
 						float co1[3], co2[3];
 
-						VecCopyf(co1, eed->v1->co);
-						VecCopyf(co2, eed->v2->co);
+						copy_v3_v3(co1, eed->v1->co);
+						copy_v3_v3(co2, eed->v2->co);
 
 						if (mmd->mirror_ob) {
-							VecMat4MulVecfl(co1, mtx, co1);
-							VecMat4MulVecfl(co2, mtx, co2);
+							mul_v3_m4v3(co1, mtx, co1);
+							mul_v3_m4v3(co2, mtx, co2);
 						}
 
 						if (mmd->flag & MOD_MIR_AXIS_X)
@@ -1380,7 +1380,7 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short flag, float *n
 		}
 	}
 	
-	Normalize(nor);	// translation normal grab
+	normalize_v3(nor);	// translation normal grab
 	
 	/* step 7: redo selection */
 	EM_clear_flag_all(em, SELECT);
@@ -1503,20 +1503,20 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor)
 				float mtx[4][4];
 				if (mmd->mirror_ob) {
 					float imtx[4][4];
-					Mat4Invert(imtx, mmd->mirror_ob->obmat);
-					Mat4MulMat4(mtx, obedit->obmat, imtx);
+					invert_m4_m4(imtx, mmd->mirror_ob->obmat);
+					mul_m4_m4m4(mtx, obedit->obmat, imtx);
 				}
 
 				for (eed= em->edges.first; eed; eed= eed->next) {
 					if(eed->f2 == 2) {
 						float co1[3], co2[3];
 
-						VecCopyf(co1, eed->v1->co);
-						VecCopyf(co2, eed->v2->co);
+						copy_v3_v3(co1, eed->v1->co);
+						copy_v3_v3(co2, eed->v2->co);
 
 						if (mmd->mirror_ob) {
-							VecMat4MulVecfl(co1, mtx, co1);
-							VecMat4MulVecfl(co2, mtx, co2);
+							mul_v3_m4v3(co1, mtx, co1);
+							mul_v3_m4v3(co2, mtx, co2);
 						}
 
 						if (mmd->flag & MOD_MIR_AXIS_X)
@@ -1652,7 +1652,7 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor)
 		efa= nextvl;
 	}
 	
-	Normalize(nor);	// for grab
+	normalize_v3(nor);	// for grab
 	
 	/* for all vertices with eve->tmp.v!=0 
 		if eve->f1==1: make edge
@@ -1704,7 +1704,7 @@ void rotateflag(EditMesh *em, short flag, float *cent, float rotmat[][3])
 			eve->co[0]-=cent[0];
 			eve->co[1]-=cent[1];
 			eve->co[2]-=cent[2];
-			Mat3MulVecfl(rotmat,eve->co);
+			mul_m3_v3(rotmat,eve->co);
 			eve->co[0]+=cent[0];
 			eve->co[1]+=cent[1];
 			eve->co[2]+=cent[2];
@@ -1913,24 +1913,24 @@ void recalc_editnormals(EditMesh *em)
 
 	for(efa= em->faces.first; efa; efa=efa->next) {
 		if(efa->v4) {
-			CalcNormFloat4(efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co, efa->n);
-			CalcCent4f(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
-			VecAddf(efa->v4->no, efa->v4->no, efa->n);
+			normal_quad_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+			cent_quad_v3(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+			add_v3_v3v3(efa->v4->no, efa->v4->no, efa->n);
 		}
 		else {
-			CalcNormFloat(efa->v1->co, efa->v2->co, efa->v3->co, efa->n);
-			CalcCent3f(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co);
+			normal_tri_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co);
+			cent_tri_v3(efa->cent, efa->v1->co, efa->v2->co, efa->v3->co);
 		}
-		VecAddf(efa->v1->no, efa->v1->no, efa->n);
-		VecAddf(efa->v2->no, efa->v2->no, efa->n);
-		VecAddf(efa->v3->no, efa->v3->no, efa->n);
+		add_v3_v3v3(efa->v1->no, efa->v1->no, efa->n);
+		add_v3_v3v3(efa->v2->no, efa->v2->no, efa->n);
+		add_v3_v3v3(efa->v3->no, efa->v3->no, efa->n);
 	}
 
 	/* following Mesh convention; we use vertex coordinate itself for normal in this case */
 	for(eve= em->verts.first; eve; eve=eve->next) {
-		if (Normalize(eve->no)==0.0) {
+		if (normalize_v3(eve->no)==0.0) {
 			VECCOPY(eve->no, eve->co);
-			Normalize(eve->no);
+			normalize_v3(eve->no);
 		}
 	}
 }
@@ -1996,8 +1996,8 @@ int convex(float *v1, float *v2, float *v3, float *v4)
 	float nor[3], nor1[3], nor2[3], vec[4][2];
 	
 	/* define projection, do both trias apart, quad is undefined! */
-	CalcNormFloat(v1, v2, v3, nor1);
-	CalcNormFloat(v1, v3, v4, nor2);
+	normal_tri_v3( nor1,v1, v2, v3);
+	normal_tri_v3( nor2,v1, v3, v4);
 	nor[0]= ABS(nor1[0]) + ABS(nor2[0]);
 	nor[1]= ABS(nor1[1]) + ABS(nor2[1]);
 	nor[2]= ABS(nor1[2]) + ABS(nor2[2]);
@@ -2022,7 +2022,7 @@ int convex(float *v1, float *v2, float *v3, float *v4)
 	}
 	
 	/* linetests, the 2 diagonals have to instersect to be convex */
-	if( IsectLL2Df(vec[0], vec[2], vec[1], vec[3]) > 0 ) return 1;
+	if( isect_line_line_v2(vec[0], vec[2], vec[1], vec[3]) > 0 ) return 1;
 	return 0;
 }
 
@@ -2037,22 +2037,22 @@ int convex(float *v1, float *v2, float *v3, float *v4)
 
 float EM_face_area(EditFace *efa)
 {
-	if(efa->v4) return AreaQ3Dfl(efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
-	else return AreaT3Dfl(efa->v1->co, efa->v2->co, efa->v3->co);
+	if(efa->v4) return area_quad_v3(efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+	else return area_tri_v3(efa->v1->co, efa->v2->co, efa->v3->co);
 }
 
 float EM_face_perimeter(EditFace *efa)
 {	
 	if(efa->v4) return
-		VecLenf(efa->v1->co, efa->v2->co)+
-		VecLenf(efa->v2->co, efa->v3->co)+
-		VecLenf(efa->v3->co, efa->v4->co)+
-		VecLenf(efa->v4->co, efa->v1->co);
+		len_v3v3(efa->v1->co, efa->v2->co)+
+		len_v3v3(efa->v2->co, efa->v3->co)+
+		len_v3v3(efa->v3->co, efa->v4->co)+
+		len_v3v3(efa->v4->co, efa->v1->co);
 	
 	else return
-		VecLenf(efa->v1->co, efa->v2->co)+
-		VecLenf(efa->v2->co, efa->v3->co)+
-		VecLenf(efa->v3->co, efa->v1->co);
+		len_v3v3(efa->v1->co, efa->v2->co)+
+		len_v3v3(efa->v2->co, efa->v3->co)+
+		len_v3v3(efa->v3->co, efa->v1->co);
 }
 
 void EM_fgon_flags(EditMesh *em)
@@ -2240,7 +2240,7 @@ UvVertMap *EM_make_uv_vert_map(EditMesh *em, int selected, int do_face_idx_array
 				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
 				uv2 = tf->uv[iterv->tfindex];
 				
-				Vec2Subf(uvdiff, uv2, uv);
+				sub_v2_v2v2(uvdiff, uv2, uv);
 
 				if(fabs(uv[0]-uv2[0]) < limit[0] && fabs(uv[1]-uv2[1]) < limit[1]) {
 					if(lastv) lastv->next= next;
diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c
index 3dc9c81a213..fd665f07767 100644
--- a/source/blender/editors/mesh/editmesh_loop.c
+++ b/source/blender/editors/mesh/editmesh_loop.c
@@ -49,7 +49,7 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 
@@ -672,7 +672,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
 		scr = MEM_mallocN(sizeof(float)*2, "Vertex Screen Coordinates");
 		VECCOPY(co, eve->co);
 		co[3]= 1.0;
-		Mat4MulVec4fl(obedit->obmat, co);
+		mul_m4_v4(obedit->obmat, co);
 		project_float(ar, co, scr);
 		BLI_ghash_insert(gh, eve, scr);
 		eve->f1 = 0; /*store vertex intersection flag here*/
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index 737f658d46f..93bfdb37581 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -53,7 +53,7 @@ editmesh_mods.c, UI level access, no geometry changes
 #include "DNA_view3d_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
 
@@ -488,7 +488,7 @@ static void findnearestedge__doClosest(void *userData, EditEdge *eed, int x0, in
 	v2[0] = x1;
 	v2[1] = y1;
 		
-	distance= PdistVL2Dfl(data->mval, v1, v2);
+	distance= dist_to_line_segment_v2(data->mval, v1, v2);
 		
 	if(eed->f & SELECT) distance+=5;
 	if(distance < data->dist) {
@@ -499,7 +499,7 @@ static void findnearestedge__doClosest(void *userData, EditEdge *eed, int x0, in
 			vec[0]= eed->v1->co[0] + labda*(eed->v2->co[0] - eed->v1->co[0]);
 			vec[1]= eed->v1->co[1] + labda*(eed->v2->co[1] - eed->v1->co[1]);
 			vec[2]= eed->v1->co[2] + labda*(eed->v2->co[2] - eed->v1->co[2]);
-			Mat4MulVecfl(data->vc.obedit->obmat, vec);
+			mul_m4_v3(data->vc.obedit->obmat, vec);
 
 			if(view3d_test_clipping(data->vc.rv3d, vec)==0) {
 				data->dist = distance;
@@ -825,7 +825,7 @@ static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode)
 				float angle;
 				for(efa= em->faces.first; efa; efa= efa->next) {
 					if (!(efa->f & SELECT) && !efa->h) {
-						angle= RAD2DEG(VecAngle2(base_efa->n, efa->n));
+						angle= RAD2DEG(angle_v2v2(base_efa->n, efa->n));
 						if (angle/180.0<=thresh) {
 							EM_select_face(efa, 1);
 							selcount++;
@@ -837,12 +837,12 @@ static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode)
 				}
 			} else if (mode==SIMFACE_COPLANAR) { /* same planer */
 				float angle, base_dot, dot;
-				base_dot= Inpf(base_efa->cent, base_efa->n);
+				base_dot= dot_v3v3(base_efa->cent, base_efa->n);
 				for(efa= em->faces.first; efa; efa= efa->next) {
 					if (!(efa->f & SELECT) && !efa->h) {
-						angle= RAD2DEG(VecAngle2(base_efa->n, efa->n));
+						angle= RAD2DEG(angle_v2v2(base_efa->n, efa->n));
 						if (angle/180.0<=thresh) {
-							dot=Inpf(efa->cent, base_efa->n);
+							dot=dot_v3v3(efa->cent, base_efa->n);
 							if (fabs(base_dot-dot) <= thresh) {
 								EM_select_face(efa, 1);
 								selcount++;
@@ -916,7 +916,7 @@ static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mod
 	if (mode==SIMEDGE_LENGTH) { /*store length*/
 		for(eed= em->edges.first; eed; eed= eed->next) {
 			if (!eed->h) /* dont calc data for hidden edges*/
-				eed->tmp.fp= VecLenf(eed->v1->co, eed->v2->co);
+				eed->tmp.fp= len_v3v3(eed->v1->co, eed->v2->co);
 		}
 	} else if (mode==SIMEDGE_FACE) { /*store face users*/
 		EditFace *efa;
@@ -959,7 +959,7 @@ static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mod
 					else if (eed->f2==0) /* first access, assign the face */
 						eed->tmp.f= efa;
 					else if (eed->f2==1) /* second, we assign the angle*/
-						eed->tmp.fp= RAD2DEG(VecAngle2(eed->tmp.f->n, efa->n))/180;
+						eed->tmp.fp= RAD2DEG(angle_v2v2(eed->tmp.f->n, efa->n))/180;
 					eed->f2++; /* f2==0 no face assigned. f2==1 one face found. f2==2 angle calculated.*/
 				}
 				j++;
@@ -985,11 +985,11 @@ static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mod
 				}
 			} else if (mode==SIMEDGE_DIR) { /* same direction */
 				float base_dir[3], dir[3], angle;
-				VecSubf(base_dir, base_eed->v1->co, base_eed->v2->co);
+				sub_v3_v3v3(base_dir, base_eed->v1->co, base_eed->v2->co);
 				for(eed= em->edges.first; eed; eed= eed->next) {
 					if (!(eed->f & SELECT) && !eed->h) {
-						VecSubf(dir, eed->v1->co, eed->v2->co);
-						angle= RAD2DEG(VecAngle2(base_dir, dir));
+						sub_v3_v3v3(dir, eed->v1->co, eed->v2->co);
+						angle= RAD2DEG(angle_v2v2(base_dir, dir));
 						
 						if (angle>90) /* use the smallest angle between the edges */
 							angle= fabs(angle-180.0f);
@@ -1161,7 +1161,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 				float angle;
 				for(eve= em->verts.first; eve; eve= eve->next) {
 					if (!(eve->f & SELECT) && !eve->h) {
-						angle= RAD2DEG(VecAngle2(base_eve->no, eve->no));
+						angle= RAD2DEG(angle_v2v2(base_eve->no, eve->no));
 						if (angle/180.0<=thresh) {
 							eve->f |= SELECT;
 							selcount++;
@@ -1388,34 +1388,34 @@ void EM_mesh_copy_edge(EditMesh *em, short type)
 		break;
 
 	case 3: /* copy length */
-		eed_len_act = VecLenf(eed_act->v1->co, eed_act->v2->co);
+		eed_len_act = len_v3v3(eed_act->v1->co, eed_act->v2->co);
 		for(eed=em->edges.first; eed; eed=eed->next) {
 			if (eed->f & SELECT && eed != eed_act) {
 
-				eed_len = VecLenf(eed->v1->co, eed->v2->co);
+				eed_len = len_v3v3(eed->v1->co, eed->v2->co);
 
 				if (eed_len == eed_len_act) continue;
 				/* if this edge is zero length we cont do anything with it*/
 				if (eed_len == 0.0f) continue;
 				if (eed_len_act == 0.0f) {
-					VecAddf(vec_mid, eed->v1->co, eed->v2->co);
-					VecMulf(vec_mid, 0.5);
+					add_v3_v3v3(vec_mid, eed->v1->co, eed->v2->co);
+					mul_v3_fl(vec_mid, 0.5);
 					VECCOPY(eed->v1->co, vec_mid);
 					VECCOPY(eed->v2->co, vec_mid);
 				} else {
 					/* copy the edge length */
-					VecAddf(vec_mid, eed->v1->co, eed->v2->co);
-					VecMulf(vec_mid, 0.5);
+					add_v3_v3v3(vec_mid, eed->v1->co, eed->v2->co);
+					mul_v3_fl(vec_mid, 0.5);
 
 					/* SCALE 1 */
-					VecSubf(vec, eed->v1->co, vec_mid);
-					VecMulf(vec, eed_len_act/eed_len);
-					VecAddf(eed->v1->co, vec, vec_mid);
+					sub_v3_v3v3(vec, eed->v1->co, vec_mid);
+					mul_v3_fl(vec, eed_len_act/eed_len);
+					add_v3_v3v3(eed->v1->co, vec, vec_mid);
 
 					/* SCALE 2 */
-					VecSubf(vec, eed->v2->co, vec_mid);
-					VecMulf(vec, eed_len_act/eed_len);
-					VecAddf(eed->v2->co, vec, vec_mid);
+					sub_v3_v3v3(vec, eed->v2->co, vec_mid);
+					mul_v3_fl(vec, eed_len_act/eed_len);
+					add_v3_v3v3(eed->v2->co, vec, vec_mid);
 				}
 				change = 1;
 			}
@@ -3873,7 +3873,7 @@ void righthandfaces(EditMesh *em, int select)	/* makes faces righthand turning *
 
 		while(efa) {
 			if(efa->f1) {
-				CalcCent3f(cent, efa->v1->co, efa->v2->co, efa->v3->co);
+				cent_tri_v3(cent, efa->v1->co, efa->v2->co, efa->v3->co);
 				cent[0]= cent[0]*cent[0] + cent[1]*cent[1] + cent[2]*cent[2];
 				
 				if(cent[0]>maxx) {
@@ -3882,7 +3882,7 @@ void righthandfaces(EditMesh *em, int select)	/* makes faces righthand turning *
 					tria_nr= 0;
 				}
 				if(efa->v4) {
-					CalcCent3f(cent, efa->v1->co, efa->v3->co, efa->v4->co);
+					cent_tri_v3(cent, efa->v1->co, efa->v3->co, efa->v4->co);
 					cent[0]= cent[0]*cent[0] + cent[1]*cent[1] + cent[2]*cent[2];
 					
 					if(cent[0]>maxx) {
@@ -3901,11 +3901,11 @@ void righthandfaces(EditMesh *em, int select)	/* makes faces righthand turning *
 		/* set first face correct: calc normal */
 		
 		if(tria_nr==1) {
-			CalcNormFloat(startvl->v1->co, startvl->v3->co, startvl->v4->co, nor);
-			CalcCent3f(cent, startvl->v1->co, startvl->v3->co, startvl->v4->co);
+			normal_tri_v3( nor,startvl->v1->co, startvl->v3->co, startvl->v4->co);
+			cent_tri_v3(cent, startvl->v1->co, startvl->v3->co, startvl->v4->co);
 		} else {
-			CalcNormFloat(startvl->v1->co, startvl->v2->co, startvl->v3->co, nor);
-			CalcCent3f(cent, startvl->v1->co, startvl->v2->co, startvl->v3->co);
+			normal_tri_v3( nor,startvl->v1->co, startvl->v2->co, startvl->v3->co);
+			cent_tri_v3(cent, startvl->v1->co, startvl->v2->co, startvl->v3->co);
 		}
 		/* first normal is oriented this way or the other */
 		if(select) {
@@ -4115,9 +4115,9 @@ void faceselect_align_view_to_selected(View3D *v3d, RegionView3D *rv3d, Mesh *me
 			v3= me->mvert[mf->v3].co;
 			if (mf->v4) {
 				float *v4= me->mvert[mf->v4].co;
-				CalcNormFloat4(v1, v2, v3, v4, fno);
+				normal_quad_v3( fno,v1, v2, v3, v4);
 			} else {
-				CalcNormFloat(v1, v2, v3, fno);
+				normal_tri_v3( fno,v1, v2, v3);
 			}
 
 			norm[0]+= fno[0];
@@ -4140,18 +4140,18 @@ static void face_getnormal_obspace(Object *obedit, EditFace *efa, float *fno)
 	float vec[4][3];
 	
 	VECCOPY(vec[0], efa->v1->co);
-	Mat4Mul3Vecfl(obedit->obmat, vec[0]);
+	mul_mat3_m4_v3(obedit->obmat, vec[0]);
 	VECCOPY(vec[1], efa->v2->co);
-	Mat4Mul3Vecfl(obedit->obmat, vec[1]);
+	mul_mat3_m4_v3(obedit->obmat, vec[1]);
 	VECCOPY(vec[2], efa->v3->co);
-	Mat4Mul3Vecfl(obedit->obmat, vec[2]);
+	mul_mat3_m4_v3(obedit->obmat, vec[2]);
 	if(efa->v4) {
 		VECCOPY(vec[3], efa->v4->co);
-		Mat4Mul3Vecfl(obedit->obmat, vec[3]);
+		mul_mat3_m4_v3(obedit->obmat, vec[3]);
 		
-		CalcNormFloat4(vec[0], vec[1], vec[2], vec[3], fno);
+		normal_quad_v3( fno,vec[0], vec[1], vec[2], vec[3]);
 	}
-	else CalcNormFloat(vec[0], vec[1], vec[2], fno);
+	else normal_tri_v3( fno,vec[0], vec[1], vec[2]);
 }
 
 
@@ -4187,7 +4187,7 @@ void editmesh_align_view_to_selected(Object *obedit, EditMesh *em, wmOperator *o
 			if (eve->f & SELECT) {
 				if (leve) {
 					float tno[3];
-					CalcNormFloat(cent, leve->co, eve->co, tno);
+					normal_tri_v3( tno,cent, leve->co, eve->co);
 					
 						/* XXX, fixme, should be flipped intp a 
 						 * consistent direction. -zr
@@ -4200,7 +4200,7 @@ void editmesh_align_view_to_selected(Object *obedit, EditMesh *em, wmOperator *o
 			}
 		}
 
-		Mat4Mul3Vecfl(obedit->obmat, norm);
+		mul_mat3_m4_v3(obedit->obmat, norm);
 		view3d_align_axis_to_vector(v3d, rv3d, axis, norm);
 	} 
 	else if (nselverts==2) { /* Align view to edge (or 2 verts) */ 
@@ -4217,7 +4217,7 @@ void editmesh_align_view_to_selected(Object *obedit, EditMesh *em, wmOperator *o
 				leve= eve;
 			}
 		}
-		Mat4Mul3Vecfl(obedit->obmat, norm);
+		mul_mat3_m4_v3(obedit->obmat, norm);
 		view3d_align_axis_to_vector(v3d, rv3d, axis, norm);
 	} 
 	else if (nselverts==1) { /* Align view to vert normal */ 
@@ -4231,7 +4231,7 @@ void editmesh_align_view_to_selected(Object *obedit, EditMesh *em, wmOperator *o
 				break; /* we know this is the only selected vert, so no need to keep looking */
 			}
 		}
-		Mat4Mul3Vecfl(obedit->obmat, norm);
+		mul_mat3_m4_v3(obedit->obmat, norm);
 		view3d_align_axis_to_vector(v3d, rv3d, axis, norm);
 	}
 } 
@@ -4312,11 +4312,11 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 			
 			if((eed->v1->f & SELECT) && eed->v1->f1<255) {
 				eed->v1->f1++;
-				VecAddf(eed->v1->tmp.p, eed->v1->tmp.p, fvec);
+				add_v3_v3v3(eed->v1->tmp.p, eed->v1->tmp.p, fvec);
 			}
 			if((eed->v2->f & SELECT) && eed->v2->f1<255) {
 				eed->v2->f1++;
-				VecAddf(eed->v2->tmp.p, eed->v2->tmp.p, fvec);
+				add_v3_v3v3(eed->v2->tmp.p, eed->v2->tmp.p, fvec);
 			}
 		}
 		eed= eed->next;
@@ -4435,7 +4435,7 @@ void vertexnoise(Object *obedit, EditMesh *em)
 				vec[1]= 0.2*(b2-BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1]+ofs, eve->co[2]));
 				vec[2]= 0.2*(b2-BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]+ofs));
 				
-				VecAddf(eve->co, eve->co, vec);
+				add_v3_v3v3(eve->co, eve->co, vec);
 			}
 			else {
 				float tin, dum;
@@ -4466,8 +4466,8 @@ void flipface(EditMesh *em, EditFace *efa)
 		EM_data_interp_from_faces(em, efa, NULL, efa, 0, 2, 1, 3);
 	}
 
-	if(efa->v4) CalcNormFloat4(efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co, efa->n);
-	else CalcNormFloat(efa->v1->co, efa->v2->co, efa->v3->co, efa->n);
+	if(efa->v4) normal_quad_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co, efa->v4->co);
+	else normal_tri_v3( efa->n,efa->v1->co, efa->v2->co, efa->v3->co);
 }
 
 
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index cea7ec33d3a..c59fb01ec99 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -58,7 +58,7 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 #include "RNA_access.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_ghash.h"
@@ -150,7 +150,7 @@ static void convert_to_triface(EditMesh *em, int direction)
 		if(efa->v4) {
 			if(efa->f & SELECT) {
 				/* choose shortest diagonal for split */
-				fac= VecLenf(efa->v1->co, efa->v3->co) - VecLenf(efa->v2->co, efa->v4->co);
+				fac= len_v3v3(efa->v1->co, efa->v3->co) - len_v3v3(efa->v2->co, efa->v4->co);
 				/* this makes sure exact squares get split different in both cases */
 				if( (direction==0 && fac<FLT_EPSILON) || (direction && fac>0.0f) ) {
 					efan= EM_face_from_faces(em, efa, NULL, 0, 1, 2, -1);
@@ -689,8 +689,8 @@ void extrude_mesh(Scene *scene, Object *obedit, EditMesh *em, wmOperator *op)
 		else {
 //			initTransform(TFM_TRANSLATION, CTX_NO_PET|CTX_NO_MIRROR);
 			if(transmode=='n') {
-				Mat4MulVecfl(obedit->obmat, nor);
-				VecSubf(nor, nor, obedit->obmat[3]);
+				mul_m4_v3(obedit->obmat, nor);
+				sub_v3_v3v3(nor, nor, obedit->obmat[3]);
 //				BIF_setSingleAxisConstraint(nor, "along normal");
 			}
 //			Transform();
@@ -816,15 +816,15 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op)
 	dvec[0]= rv3d->persinv[2][0];
 	dvec[1]= rv3d->persinv[2][1];
 	dvec[2]= rv3d->persinv[2][2];
-	Normalize(dvec);
+	normalize_v3(dvec);
 	dvec[0]*= offs;
 	dvec[1]*= offs;
 	dvec[2]*= offs;
 
 	/* base correction */
-	Mat3CpyMat4(bmat, obedit->obmat);
-	Mat3Inv(tmat, bmat);
-	Mat3MulVecfl(tmat, dvec);
+	copy_m3_m4(bmat, obedit->obmat);
+	invert_m3_m3(tmat, bmat);
+	mul_m3_v3(tmat, dvec);
 
 	for(a=0; a<steps; a++) {
 		extrudeflag(obedit, em, SELECT, nor);
@@ -879,30 +879,30 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 	RNA_float_get_array(op->ptr, "center", cent);
 
 	/* imat and center and size */
-	Mat3CpyMat4(bmat, obedit->obmat);
-	Mat3Inv(imat,bmat);
+	copy_m3_m4(bmat, obedit->obmat);
+	invert_m3_m3(imat,bmat);
 
 	cent[0]-= obedit->obmat[3][0];
 	cent[1]-= obedit->obmat[3][1];
 	cent[2]-= obedit->obmat[3][2];
-	Mat3MulVecfl(imat, cent);
+	mul_m3_v3(imat, cent);
 
 	phi= degr*M_PI/360.0;
 	phi/= steps;
 	if(ts->editbutflag & B_CLOCKWISE) phi= -phi;
 
 	RNA_float_get_array(op->ptr, "axis", n);
-	Normalize(n);
+	normalize_v3(n);
 
 	q[0]= (float)cos(phi);
 	si= (float)sin(phi);
 	q[1]= n[0]*si;
 	q[2]= n[1]*si;
 	q[3]= n[2]*si;
-	QuatToMat3(q, cmat);
+	quat_to_mat3( cmat,q);
 
-	Mat3MulMat3(tmat,cmat,bmat);
-	Mat3MulMat3(bmat,imat,tmat);
+	mul_m3_m3m3(tmat,cmat,bmat);
+	mul_m3_m3m3(bmat,imat,tmat);
 
 	if(dupli==0)
 		if(ts->editbutflag & B_KEEPORIG)
@@ -917,7 +917,7 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 
 		rotateflag(em, SELECT, cent, bmat);
 		if(dvec) {
-			Mat3MulVecfl(bmat,dvec);
+			mul_m3_v3(bmat,dvec);
 			translateflag(em, SELECT, dvec);
 		}
 	}
@@ -1362,8 +1362,8 @@ static void alter_co(float *co, EditEdge *edge, float smooth, float fractal, int
 		/* we calculate an offset vector vec1[], to be added to *co */
 		float len, fac, nor[3], nor1[3], nor2[3];
 
-		VecSubf(nor, edge->v1->co, edge->v2->co);
-		len= 0.5f*Normalize(nor);
+		sub_v3_v3v3(nor, edge->v1->co, edge->v2->co);
+		len= 0.5f*normalize_v3(nor);
 
 		VECCOPY(nor1, edge->v1->no);
 		VECCOPY(nor2, edge->v2->no);
@@ -1394,18 +1394,18 @@ static void alter_co(float *co, EditEdge *edge, float smooth, float fractal, int
 		co[2] += vec1[2];
 	}
 	else if(beauty & B_SPHERE) { /* subdivide sphere */
-		Normalize(co);
+		normalize_v3(co);
 		co[0]*= smooth;
 		co[1]*= smooth;
 		co[2]*= smooth;
 	}
 
 	if(beauty & B_FRACTAL) {
-		fac= fractal*VecLenf(edge->v1->co, edge->v2->co);
+		fac= fractal*len_v3v3(edge->v1->co, edge->v2->co);
 		vec1[0]= fac*(float)(0.5-BLI_drand());
 		vec1[1]= fac*(float)(0.5-BLI_drand());
 		vec1[2]= fac*(float)(0.5-BLI_drand());
-		VecAddf(co, co, vec1);
+		add_v3_v3v3(co, co, vec1);
 	}
 }
 
@@ -1446,7 +1446,7 @@ static EditVert *subdivide_edge_addvert(EditMesh *em, EditEdge *edge, float smoo
 	ev->no[0] = (edge->v2->no[0]-edge->v1->no[0])*percent + edge->v1->no[0];
 	ev->no[1] = (edge->v2->no[1]-edge->v1->no[1])*percent + edge->v1->no[1];
 	ev->no[2] = (edge->v2->no[2]-edge->v1->no[2])*percent + edge->v1->no[2];
-	Normalize(ev->no);
+	normalize_v3(ev->no);
 
 	return ev;
 }
@@ -1475,11 +1475,11 @@ static void facecopy(EditMesh *em, EditFace *source, EditFace *target)
 	target->flag   = source->flag;
 	target->h	   = source->h;
 
-	InterpWeightsQ3Dfl(v1, v2, v3, v4, target->v1->co, w[0]);
-	InterpWeightsQ3Dfl(v1, v2, v3, v4, target->v2->co, w[1]);
-	InterpWeightsQ3Dfl(v1, v2, v3, v4, target->v3->co, w[2]);
+	interp_weights_face_v3( w[0],v1, v2, v3, v4, target->v1->co);
+	interp_weights_face_v3( w[1],v1, v2, v3, v4, target->v2->co);
+	interp_weights_face_v3( w[2],v1, v2, v3, v4, target->v3->co);
 	if (target->v4)
-		InterpWeightsQ3Dfl(v1, v2, v3, v4, target->v4->co, w[3]);
+		interp_weights_face_v3( w[3],v1, v2, v3, v4, target->v4->co);
 
 	CustomData_em_interp(&em->fdata, &source->data, NULL, (float*)w, 1, target->data);
 }
@@ -2623,15 +2623,15 @@ void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float
 				VECCOPY(v2mat, ef->v2->co);
 				VECCOPY(v3mat, ef->v3->co);
 				VECCOPY(v4mat, ef->v4->co);
-				Mat4Mul3Vecfl(obedit->obmat, v1mat);
-				Mat4Mul3Vecfl(obedit->obmat, v2mat);
-				Mat4Mul3Vecfl(obedit->obmat, v3mat);
-				Mat4Mul3Vecfl(obedit->obmat, v4mat);
-
-				length[0] = VecLenf(v1mat, v2mat);
-				length[1] = VecLenf(v2mat, v3mat);
-				length[2] = VecLenf(v3mat, v4mat);
-				length[3] = VecLenf(v4mat, v1mat);
+				mul_mat3_m4_v3(obedit->obmat, v1mat);
+				mul_mat3_m4_v3(obedit->obmat, v2mat);
+				mul_mat3_m4_v3(obedit->obmat, v3mat);
+				mul_mat3_m4_v3(obedit->obmat, v4mat);
+
+				length[0] = len_v3v3(v1mat, v2mat);
+				length[1] = len_v3v3(v2mat, v3mat);
+				length[2] = len_v3v3(v3mat, v4mat);
+				length[3] = len_v3v3(v4mat, v1mat);
 				sort[0] = ef->e1;
 				sort[1] = ef->e2;
 				sort[2] = ef->e3;
@@ -3121,43 +3121,43 @@ static float measure_facepair(EditVert *v1, EditVert *v2, EditVert *v3, EditVert
 			minarea, maxarea, areaA, areaB;
 
 	/*First Test: Normal difference*/
-	CalcNormFloat(v1->co, v2->co, v3->co, noA1);
-	CalcNormFloat(v1->co, v3->co, v4->co, noA2);
+	normal_tri_v3( noA1,v1->co, v2->co, v3->co);
+	normal_tri_v3( noA2,v1->co, v3->co, v4->co);
 
 	if(noA1[0] == noA2[0] && noA1[1] == noA2[1] && noA1[2] == noA2[2]) normalADiff = 0.0;
-	else normalADiff = RAD2DEG(VecAngle2(noA1, noA2));
+	else normalADiff = RAD2DEG(angle_v2v2(noA1, noA2));
 		//if(!normalADiff) normalADiff = 179;
-	CalcNormFloat(v2->co, v3->co, v4->co, noB1);
-	CalcNormFloat(v4->co, v1->co, v2->co, noB2);
+	normal_tri_v3( noB1,v2->co, v3->co, v4->co);
+	normal_tri_v3( noB2,v4->co, v1->co, v2->co);
 
 	if(noB1[0] == noB2[0] && noB1[1] == noB2[1] && noB1[2] == noB2[2]) normalBDiff = 0.0;
-	else normalBDiff = RAD2DEG(VecAngle2(noB1, noB2));
+	else normalBDiff = RAD2DEG(angle_v2v2(noB1, noB2));
 		//if(!normalBDiff) normalBDiff = 179;
 
 	measure += (normalADiff/360) + (normalBDiff/360);
 	if(measure > limit) return measure;
 
 	/*Second test: Colinearity*/
-	VecSubf(edgeVec1, v1->co, v2->co);
-	VecSubf(edgeVec2, v2->co, v3->co);
-	VecSubf(edgeVec3, v3->co, v4->co);
-	VecSubf(edgeVec4, v4->co, v1->co);
+	sub_v3_v3v3(edgeVec1, v1->co, v2->co);
+	sub_v3_v3v3(edgeVec2, v2->co, v3->co);
+	sub_v3_v3v3(edgeVec3, v3->co, v4->co);
+	sub_v3_v3v3(edgeVec4, v4->co, v1->co);
 
 	diff = 0.0;
 
 	diff = (
-		fabs(RAD2DEG(VecAngle2(edgeVec1, edgeVec2)) - 90) +
-		fabs(RAD2DEG(VecAngle2(edgeVec2, edgeVec3)) - 90) +
-		fabs(RAD2DEG(VecAngle2(edgeVec3, edgeVec4)) - 90) +
-		fabs(RAD2DEG(VecAngle2(edgeVec4, edgeVec1)) - 90)) / 360;
+		fabs(RAD2DEG(angle_v2v2(edgeVec1, edgeVec2)) - 90) +
+		fabs(RAD2DEG(angle_v2v2(edgeVec2, edgeVec3)) - 90) +
+		fabs(RAD2DEG(angle_v2v2(edgeVec3, edgeVec4)) - 90) +
+		fabs(RAD2DEG(angle_v2v2(edgeVec4, edgeVec1)) - 90)) / 360;
 	if(!diff) return 0.0;
 
 	measure +=  diff;
 	if(measure > limit) return measure;
 
 	/*Third test: Concavity*/
-	areaA = AreaT3Dfl(v1->co, v2->co, v3->co) + AreaT3Dfl(v1->co, v3->co, v4->co);
-	areaB = AreaT3Dfl(v2->co, v3->co, v4->co) + AreaT3Dfl(v4->co, v1->co, v2->co);
+	areaA = area_tri_v3(v1->co, v2->co, v3->co) + area_tri_v3(v1->co, v3->co, v4->co);
+	areaB = area_tri_v3(v2->co, v3->co, v4->co) + area_tri_v3(v4->co, v1->co, v2->co);
 
 	if(areaA <= areaB) minarea = areaA;
 	else minarea = areaB;
@@ -4370,9 +4370,9 @@ useless:
 			}
 
 			if(prop == 0) {
-				len = VecLenf(upVert->co,downVert->co)*((perc+1)/2);
+				len = len_v3v3(upVert->co,downVert->co)*((perc+1)/2);
 				if(flip == 1) {
-					len = VecLenf(upVert->co,downVert->co) - len;
+					len = len_v3v3(upVert->co,downVert->co) - len;
 				}
 			}
 
@@ -4387,7 +4387,7 @@ useless:
 				}
 				else
 				{
-					len = MIN2(perc, VecLenf(upVert->co,downVert->co));
+					len = MIN2(perc, len_v3v3(upVert->co,downVert->co));
 					len = MAX2(len, 0);
 				}
 			}
@@ -4405,13 +4405,13 @@ useless:
 					tempsv = BLI_ghash_lookup(vertgh,ev);
 
 					tempev = editedge_getOtherVert((perc>=0)?tempsv->up:tempsv->down, ev);
-					VecLerpf(ev->co, tempsv->origvert.co, tempev->co, fabs(perc));
+					interp_v3_v3v3(ev->co, tempsv->origvert.co, tempev->co, fabs(perc));
 
 					if (0) { // XXX scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 						for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 							suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
 							if (suv && suv->fuv_list && suv->uv_up && suv->uv_down) {
-								Vec2Lerpf(uv_tmp, suv->origuv,  (perc>=0)?suv->uv_up:suv->uv_down, fabs(perc));
+								interp_v2_v2v2(uv_tmp, suv->origuv,  (perc>=0)?suv->uv_up:suv->uv_down, fabs(perc));
 								fuv_link = suv->fuv_list;
 								while (fuv_link) {
 									VECCOPY2D(((float *)fuv_link->link), uv_tmp);
@@ -4431,17 +4431,17 @@ useless:
 					float newlen;
 					ev = look->link;
 					tempsv = BLI_ghash_lookup(vertgh,ev);
-					newlen = (len / VecLenf(editedge_getOtherVert(tempsv->up,ev)->co,editedge_getOtherVert(tempsv->down,ev)->co));
+					newlen = (len / len_v3v3(editedge_getOtherVert(tempsv->up,ev)->co,editedge_getOtherVert(tempsv->down,ev)->co));
 					if(newlen > 1.0) {newlen = 1.0;}
 					if(newlen < 0.0) {newlen = 0.0;}
 					if(flip == 0) {
-						VecLerpf(ev->co, editedge_getOtherVert(tempsv->down,ev)->co, editedge_getOtherVert(tempsv->up,ev)->co, fabs(newlen));
+						interp_v3_v3v3(ev->co, editedge_getOtherVert(tempsv->down,ev)->co, editedge_getOtherVert(tempsv->up,ev)->co, fabs(newlen));
 						if (0) { // XXX scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 							/* dont do anything if no UVs */
 							for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 								suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
 								if (suv && suv->fuv_list && suv->uv_up && suv->uv_down) {
-									Vec2Lerpf(uv_tmp, suv->uv_down, suv->uv_up, fabs(newlen));
+									interp_v2_v2v2(uv_tmp, suv->uv_down, suv->uv_up, fabs(newlen));
 									fuv_link = suv->fuv_list;
 									while (fuv_link) {
 										VECCOPY2D(((float *)fuv_link->link), uv_tmp);
@@ -4451,14 +4451,14 @@ useless:
 							}
 						}
 					} else{
-						VecLerpf(ev->co, editedge_getOtherVert(tempsv->up,ev)->co, editedge_getOtherVert(tempsv->down,ev)->co, fabs(newlen));
+						interp_v3_v3v3(ev->co, editedge_getOtherVert(tempsv->up,ev)->co, editedge_getOtherVert(tempsv->down,ev)->co, fabs(newlen));
 
 						if (0) { // XXX scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 							/* dont do anything if no UVs */
 							for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 								suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
 								if (suv && suv->fuv_list && suv->uv_up && suv->uv_down) {
-									Vec2Lerpf(uv_tmp, suv->uv_up, suv->uv_down, fabs(newlen));
+									interp_v2_v2v2(uv_tmp, suv->uv_up, suv->uv_down, fabs(newlen));
 									fuv_link = suv->fuv_list;
 									while (fuv_link) {
 										VECCOPY2D(((float *)fuv_link->link), uv_tmp);
@@ -4768,7 +4768,7 @@ static float mesh_rip_edgedist(ARegion *ar, float mat[][4], float *co1, float *c
 	mvalf[0]= (float)mval[0];
 	mvalf[1]= (float)mval[1];
 
-	return PdistVL2Dfl(mvalf, vec1, vec2);
+	return dist_to_line_segment_v2(mvalf, vec1, vec2);
 }
 
 /* helper for below */
@@ -5120,11 +5120,11 @@ static int blend_from_shape_exec(bContext *C, wmOperator *op)
 					VECCOPY(co, data + eve->keyindex*3);
 
 					if(add) {
-						VecMulf(co, blend);
-						VecAddf(eve->co, eve->co, co);
+						mul_v3_fl(co, blend);
+						add_v3_v3v3(eve->co, eve->co, co);
 					}
 					else
-						VecLerpf(eve->co, eve->co, co, blend);
+						interp_v3_v3v3(eve->co, eve->co, co, blend);
 
 					blended= 1;
 				}
@@ -5737,7 +5737,7 @@ static void em_snap_to_center(EditMesh *em)
 
 	for (eve=em->verts.first; eve; eve=eve->next) {
 		if (eve->f & SELECT) {
-			VecAddf(cent, cent, eve->co);
+			add_v3_v3v3(cent, cent, eve->co);
 			i++;
 		}
 	}
@@ -5745,7 +5745,7 @@ static void em_snap_to_center(EditMesh *em)
 	if (!i)
 		return;
 
-	VecMulf(cent, 1.0f / (float)i);
+	mul_v3_fl(cent, 1.0f / (float)i);
 
 	for (eve=em->verts.first; eve; eve=eve->next) {
 		if (eve->f & SELECT) {
@@ -5762,11 +5762,11 @@ static void em_snap_to_cursor(EditMesh *em, bContext *C)
 	EditVert *eve;
 	float co[3], *vco, invmat[4][4];
 		
-	Mat4Invert(invmat, ob->obmat);
+	invert_m4_m4(invmat, ob->obmat);
 
 	vco = give_cursor(scene, v3d);
 	VECCOPY(co, vco);
-	Mat4MulVecfl(invmat, co);
+	mul_m4_v3(invmat, co);
 
 	for (eve=em->verts.first; eve; eve=eve->next) {
 		if (eve->f & SELECT) {
@@ -5987,7 +5987,7 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op)
 						newpe = MEM_mallocN(sizeof(PathEdge), "Path Edge");
 						newpe->v = ((PathNode*)eed->v2->tmp.p)->u;
 						if(physical){
-								newpe->w = VecLenf(eed->v1->co, eed->v2->co);
+								newpe->w = len_v3v3(eed->v1->co, eed->v2->co);
 						}
 						else newpe->w = 1;
 						newpe->next = 0;
@@ -5999,7 +5999,7 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op)
 						newpe = MEM_mallocN(sizeof(PathEdge), "Path Edge");
 						newpe->v = ((PathNode*)eed->v1->tmp.p)->u;
 						if(physical){
-								newpe->w = VecLenf(eed->v1->co, eed->v2->co);
+								newpe->w = len_v3v3(eed->v1->co, eed->v2->co);
 						}
 						else newpe->w = 1;
 						newpe->next = 0;
@@ -6813,20 +6813,20 @@ static void beauty_fill(EditMesh *em)
 							* the area divided by the total edge lengths
 							*/
 
-							len1= VecLenf(v1->co, v2->co);
-							len2= VecLenf(v2->co, v3->co);
-							len3= VecLenf(v3->co, v4->co);
-							len4= VecLenf(v4->co, v1->co);
-							len5= VecLenf(v1->co, v3->co);
-							len6= VecLenf(v2->co, v4->co);
+							len1= len_v3v3(v1->co, v2->co);
+							len2= len_v3v3(v2->co, v3->co);
+							len3= len_v3v3(v3->co, v4->co);
+							len4= len_v3v3(v4->co, v1->co);
+							len5= len_v3v3(v1->co, v3->co);
+							len6= len_v3v3(v2->co, v4->co);
 
-							opp1= AreaT3Dfl(v1->co, v2->co, v3->co);
-							opp2= AreaT3Dfl(v1->co, v3->co, v4->co);
+							opp1= area_tri_v3(v1->co, v2->co, v3->co);
+							opp2= area_tri_v3(v1->co, v3->co, v4->co);
 
 							fac1= opp1/(len1+len2+len5) + opp2/(len3+len4+len5);
 
-							opp1= AreaT3Dfl(v2->co, v3->co, v4->co);
-							opp2= AreaT3Dfl(v2->co, v4->co, v1->co);
+							opp1= area_tri_v3(v2->co, v3->co, v4->co);
+							opp2= area_tri_v3(v2->co, v4->co, v1->co);
 
 							fac2= opp1/(len2+len3+len6) + opp2/(len4+len1+len6);
 
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index f786a4a6c0b..eb6927cec65 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -50,7 +50,7 @@
 #include "BKE_mesh.h"
 #include "BKE_report.h"
 
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 
@@ -571,7 +571,7 @@ void ED_mesh_transform(Mesh *me, float *mat)
 	MVert *mvert= me->mvert;
 
 	for(i= 0; i < me->totvert; i++, mvert++)
-		Mat4MulVecfl((float (*)[4])mat, mvert->co);
+		mul_m4_v3((float (*)[4])mat, mvert->co);
 
 	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
 }
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 9f16e7adbf8..ffa9dde4493 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -39,7 +39,7 @@
 #include "DNA_view3d_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 18125207eca..5313b68be9b 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -51,7 +51,7 @@
 #include "DNA_windowmanager_types.h"
 #include "DNA_world_types.h"
 
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
@@ -305,7 +305,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	faceofs= 0;
 	
 	/* inverse transform for all selected meshes in this object */
-	Mat4Invert(imat, ob->obmat);
+	invert_m4_m4(imat, ob->obmat);
 	
 	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
 		/* only join if this is a mesh */
@@ -342,11 +342,11 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 				/* if this is the object we're merging into, no need to do anything */
 				if(base->object != ob) {
 					/* watch this: switch matmul order really goes wrong */
-					Mat4MulMat4(cmat, base->object->obmat, imat);
+					mul_m4_m4m4(cmat, base->object->obmat, imat);
 					
 					/* transform vertex coordinates into new space */
 					for(a=0, mv=mvert; a < me->totvert; a++, mv++) {
-						Mat4MulVecfl(cmat, mv->co);
+						mul_m4_v3(cmat, mv->co);
 					}
 					
 					/* for each shapekey in destination mesh:
@@ -366,7 +366,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 								fp2= ((float *)(okb->data));
 								for(a=0; a < me->totvert; a++, fp1+=3, fp2+=3) {
 									VECCOPY(fp1, fp2);
-									Mat4MulVecfl(cmat, fp1);
+									mul_m4_v3(cmat, fp1);
 								}
 							}
 							else {
@@ -633,15 +633,15 @@ void sort_faces(Scene *scene, View3D *v3d)
 		float cur[3];
 		
 		if (event == 1)
-			Mat4MulMat4(mat, OBACT->obmat, rv3d->viewmat); /* apply the view matrix to the object matrix */
+			mul_m4_m4m4(mat, OBACT->obmat, rv3d->viewmat); /* apply the view matrix to the object matrix */
 		else if (event == 2) { /* sort from cursor */
 			if( v3d && v3d->localvd ) {
 				VECCOPY(cur, v3d->cursor);
 			} else {
 				VECCOPY(cur, scene->cursor);
 			}
-			Mat4Invert(mat, OBACT->obmat);
-			Mat4MulVecfl(mat, cur);
+			invert_m4_m4(mat, OBACT->obmat);
+			mul_m4_v3(mat, cur);
 		}
 		
 		mf= me->mface;
@@ -655,21 +655,21 @@ void sort_faces(Scene *scene, View3D *v3d)
 				else						face_sort_floats[i] = reverse;
 			} else {
 				/* find the faces center */
-				VecAddf(vec, (me->mvert+mf->v1)->co, (me->mvert+mf->v2)->co);
+				add_v3_v3v3(vec, (me->mvert+mf->v1)->co, (me->mvert+mf->v2)->co);
 				if (mf->v4) {
-					VecAddf(vec, vec, (me->mvert+mf->v3)->co);
-					VecAddf(vec, vec, (me->mvert+mf->v4)->co);
-					VecMulf(vec, 0.25f);
+					add_v3_v3v3(vec, vec, (me->mvert+mf->v3)->co);
+					add_v3_v3v3(vec, vec, (me->mvert+mf->v4)->co);
+					mul_v3_fl(vec, 0.25f);
 				} else {
-					VecAddf(vec, vec, (me->mvert+mf->v3)->co);
-					VecMulf(vec, 1.0f/3.0f);
+					add_v3_v3v3(vec, vec, (me->mvert+mf->v3)->co);
+					mul_v3_fl(vec, 1.0f/3.0f);
 				} /* done */
 				
 				if (event == 1) { /* sort on view axis */
-					Mat4MulVecfl(mat, vec);
+					mul_m4_v3(mat, vec);
 					face_sort_floats[i] = vec[2] * reverse;
 				} else { /* distance from cursor*/
-					face_sort_floats[i] = VecLenf(cur, vec) * reverse; /* back to front */
+					face_sort_floats[i] = len_v3v3(cur, vec) * reverse; /* back to front */
 				}
 			}
 		}
@@ -811,12 +811,12 @@ static intptr_t mesh_octree_find_index(MocNode **bt, MVert *mvert, float *co)
 			/* does mesh verts and editmode, code looks potential dangerous, octree should really be filled OK! */
 			if(mvert) {
 				vec= (mvert+(*bt)->index[a]-1)->co;
-				if(FloatCompare(vec, co, MOC_THRESH))
+				if(compare_v3v3(vec, co, MOC_THRESH))
 					return (*bt)->index[a]-1;
 			}
 			else {
 				EditVert *eve= (EditVert *)((*bt)->index[a]);
-				if(FloatCompare(eve->co, co, MOC_THRESH))
+				if(compare_v3v3(eve->co, co, MOC_THRESH))
 					return (*bt)->index[a];
 			}
 		}
@@ -881,12 +881,12 @@ intptr_t mesh_octree_table(Object *ob, EditMesh *em, float *co, char mode)
 		MeshOctree.offs[1]-= MOC_THRESH;
 		MeshOctree.offs[2]-= MOC_THRESH;
 		
-		VecSubf(MeshOctree.div, max, min);
+		sub_v3_v3v3(MeshOctree.div, max, min);
 		MeshOctree.div[0]+= 2*MOC_THRESH;	/* and divide with 2 threshold unit more extra (try 8x8 unit grid on paint) */
 		MeshOctree.div[1]+= 2*MOC_THRESH;
 		MeshOctree.div[2]+= 2*MOC_THRESH;
 		
-		VecMulf(MeshOctree.div, 1.0f/MOC_RES);
+		mul_v3_fl(MeshOctree.div, 1.0f/MOC_RES);
 		if(MeshOctree.div[0]==0.0f) MeshOctree.div[0]= 1.0f;
 		if(MeshOctree.div[1]==0.0f) MeshOctree.div[1]= 1.0f;
 		if(MeshOctree.div[2]==0.0f) MeshOctree.div[2]= 1.0f;