- quiet new warnings with gcc 4.6

- use BLI math funcs for normal float/short conversion.
- correct some un-intentional float/double promotions.

6 files changed, 79 insertions, 87 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index cec7d7a3d54..af3716b4677 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -452,7 +452,7 @@ static float edgetag_cut_cost(int e1, int e2, int vert)
 	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]));
+	cost = cost + 0.5f*cost*(2.0f - fabsf(d1[0]*d2[0] + d1[1]*d2[1] + d1[2]*d2[2]));
 
 	return cost;
 }
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 887228c9772..f78a23f039d 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -599,7 +599,7 @@ static void edge_normal_compare(EditEdge *eed, EditFace *efa1)
 	if(efa1==efa2) return;
 	
 	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(inp<0.999f && inp >-0.999f) eed->f2= 1;
 		
 	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);
@@ -610,7 +610,7 @@ static void edge_normal_compare(EditEdge *eed, EditFace *efa1)
 	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;
+	if(inp < -0.001f) eed->f1= 1;
 }
 
 #if 0
@@ -799,10 +799,8 @@ void make_editMesh(Scene *scene, Object *ob)
 		if(!is_paint_sel)
 			eve->f |= (mvert->flag & 1);
 		
-		if (mvert->flag & ME_HIDE) eve->h= 1;		
-		eve->no[0]= mvert->no[0]/32767.0;
-		eve->no[1]= mvert->no[1]/32767.0;
-		eve->no[2]= mvert->no[2]/32767.0;
+		if (mvert->flag & ME_HIDE) eve->h= 1;
+		normal_short_to_float_v3(eve->no, mvert->no);
 
 		eve->bweight= ((float)mvert->bweight)/255.0f;
 
@@ -936,7 +934,7 @@ void load_editMesh(Scene *scene, Object *obedit)
 	EditFace *efa, *efa_act;
 	EditEdge *eed;
 	EditSelection *ese;
-	float *fp, *newkey, *oldkey, nor[3];
+	float *fp, *newkey, *oldkey;
 	int i, a, ototvert;
 	
 	/* this one also tests of edges are not in faces: */
@@ -995,9 +993,7 @@ void load_editMesh(Scene *scene, Object *obedit)
 		VECCOPY(mvert->co, eve->co);
 
 		/* vertex normal */
-		VECCOPY(nor, eve->no);
-		mul_v3_fl(nor, 32767.0);
-		VECCOPY(mvert->no, nor);
+		normal_float_to_short_v3(mvert->no, eve->no);
 
 		/* note: it used to remove me->dvert when it was not in use, cancelled
 		   that... annoying when you have a fresh vgroup */
@@ -1009,7 +1005,7 @@ void load_editMesh(Scene *scene, Object *obedit)
 		mvert->flag |= (eve->f & SELECT);
 		if (eve->h) mvert->flag |= ME_HIDE;
 		
-		mvert->bweight= (char)(255.0*eve->bweight);
+		mvert->bweight= (char)(255.0f*eve->bweight);
 
 		eve= eve->next;
 		mvert++;
@@ -1030,8 +1026,8 @@ void load_editMesh(Scene *scene, Object *obedit)
 		if(eed->h & EM_FGON) medge->flag |= ME_FGON;	// different defines yes
 		if(eed->h & 1) medge->flag |= ME_HIDE;
 		
-		medge->crease= (char)(255.0*eed->crease);
-		medge->bweight= (char)(255.0*eed->bweight);
+		medge->crease= (char)(255.0f*eed->crease);
+		medge->bweight= (char)(255.0f*eed->bweight);
 		CustomData_from_em_block(&em->edata, &me->edata, eed->data, a);		
 
 		eed->tmp.l = a++;
@@ -1663,7 +1659,7 @@ static void *editMesh_to_undoMesh(void *emv)
 		evec->h= eve->h;
 		evec->keyindex= eve->keyindex;
 		eve->tmp.l = a; /*store index*/
-		evec->bweight= (short)(eve->bweight*255.0);
+		evec->bweight= (short)(eve->bweight*255.0f);
 
 		CustomData_from_em_block(&em->vdata, &um->vdata, eve->data, a);
 	}
@@ -1677,8 +1673,8 @@ static void *editMesh_to_undoMesh(void *emv)
 		eedc->h= eed->h;
 		eedc->seam= eed->seam;
 		eedc->sharp= eed->sharp;
-		eedc->crease= (short)(eed->crease*255.0);
-		eedc->bweight= (short)(eed->bweight*255.0);
+		eedc->crease= (short)(eed->crease*255.0f);
+		eedc->bweight= (short)(eed->bweight*255.0f);
 		eedc->fgoni= eed->fgoni;
 		eed->tmp.l = a; /*store index*/
 		CustomData_from_em_block(&em->edata, &um->edata, eed->data, a);
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 3a9859cefcb..bd094211270 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -1099,9 +1099,9 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		phi= 0; 
 		phid/=2;
 		for(a=0; a<=tot; a++) {
-			vec[0]= dia*sin(phi);
+			vec[0]= dia*sinf(phi);
 			vec[1]= 0.0;
-			vec[2]= dia*cos(phi);
+			vec[2]= dia*cosf(phi);
 			eve= addvertlist(em, vec, NULL);
 			eve->f= 1+2+4;
 			if(a==0) v1= eve;
@@ -1226,8 +1226,8 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
 		for(b=0; b<=ext; b++) {
 			for(a=0; a<tot; a++) {
 				
-				vec[0]= dia*sin(phi);
-				vec[1]= dia*cos(phi);
+				vec[0]= dia*sinf(phi);
+				vec[1]= dia*cosf(phi);
 				vec[2]= b?depth:-depth;
 				
 				mul_m4_v3(mat, vec);
diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index db990e033df..e63ce98c1b0 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -353,8 +353,8 @@ void EM_editselection_plane(float *plane, EditSelection *ese)
 			we cant make a crossvec from a vec thats the same as the vec
 			unlikely but possible, so make sure if the normal is (0,0,1)
 			that vec isnt the same or in the same direction even.*/
-			if (eve->no[0]<0.5)			vec[0]=1;
-			else if (eve->no[1]<0.5)	vec[1]=1;
+			if (eve->no[0]<0.5f)		vec[0]=1;
+			else if (eve->no[1]<0.5f)	vec[1]=1;
 			else						vec[2]=1;
 			cross_v3_v3v3(plane, eve->no, vec);
 		}
@@ -1206,7 +1206,7 @@ short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor)
 		if(eed->v1->f & eed->v2->f & flag) eed->f |= flag;
 	}
 	
-	if(nor[0]==0.0 && nor[1]==0.0 && nor[2]==0.0) return 'g'; // g is grab
+	if(is_zero_v3(nor)) return 'g'; // g is grab
 	return 'n';  // n is for normal constraint
 }
 
@@ -1328,18 +1328,18 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short UNUSED(flag),
 						}
 
 						if (mmd->flag & MOD_MIR_AXIS_X)
-							if ( (fabs(co1[0]) < mmd->tolerance) &&
-								 (fabs(co2[0]) < mmd->tolerance) )
+							if ( (fabsf(co1[0]) < mmd->tolerance) &&
+								 (fabsf(co2[0]) < mmd->tolerance) )
 								++eed->f2;
 
 						if (mmd->flag & MOD_MIR_AXIS_Y)
-							if ( (fabs(co1[1]) < mmd->tolerance) &&
-								 (fabs(co2[1]) < mmd->tolerance) )
+							if ( (fabsf(co1[1]) < mmd->tolerance) &&
+								 (fabsf(co2[1]) < mmd->tolerance) )
 								++eed->f2;
 
 						if (mmd->flag & MOD_MIR_AXIS_Z)
-							if ( (fabs(co1[2]) < mmd->tolerance) &&
-								 (fabs(co2[2]) < mmd->tolerance) )
+							if ( (fabsf(co1[2]) < mmd->tolerance) &&
+								 (fabsf(co2[2]) < mmd->tolerance) )
 								++eed->f2;
 					}
 				}
@@ -1485,7 +1485,7 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short UNUSED(flag),
 
 	EM_select_flush(em);
 
-	if(nor[0]==0.0 && nor[1]==0.0 && nor[2]==0.0) return 'g'; // grab
+	if(is_zero_v3(nor)) return 'g'; // grab
 	return 'n'; // normal constraint 
 }
 
@@ -1612,17 +1612,17 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int
 						}
 
 						if (mmd->flag & MOD_MIR_AXIS_X)
-							if ( (fabs(co1[0]) < mmd->tolerance) &&
-								 (fabs(co2[0]) < mmd->tolerance) )
+							if ( (fabsf(co1[0]) < mmd->tolerance) &&
+								 (fabsf(co2[0]) < mmd->tolerance) )
 								++eed->f2;
 
 						if (mmd->flag & MOD_MIR_AXIS_Y)
-							if ( (fabs(co1[1]) < mmd->tolerance) &&
-								 (fabs(co2[1]) < mmd->tolerance) )
+							if ( (fabsf(co1[1]) < mmd->tolerance) &&
+								 (fabsf(co2[1]) < mmd->tolerance) )
 								++eed->f2;
 						if (mmd->flag & MOD_MIR_AXIS_Z)
-							if ( (fabs(co1[2]) < mmd->tolerance) &&
-								 (fabs(co2[2]) < mmd->tolerance) )
+							if ( (fabsf(co1[2]) < mmd->tolerance) &&
+								 (fabsf(co2[2]) < mmd->tolerance) )
 								++eed->f2;
 					}
 				}
@@ -1774,7 +1774,7 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int
 	// since its vertex select mode now, it also deselects higher order
 	EM_selectmode_flush(em);
 
-	if(nor[0]==0.0 && nor[1]==0.0 && nor[2]==0.0) return 'g'; // g is grab, for correct undo print
+	if(is_zero_v3(nor)) return 'g'; // g is grab, for correct undo print
 	return 'n';
 }
 
@@ -2367,7 +2367,7 @@ UvVertMap *EM_make_uv_vert_map(EditMesh *em, int selected, int do_face_idx_array
 				
 				sub_v2_v2v2(uvdiff, uv2, uv);
 
-				if(fabs(uv[0]-uv2[0]) < limit[0] && fabs(uv[1]-uv2[1]) < limit[1]) {
+				if(fabsf(uv[0]-uv2[0]) < limit[0] && fabsf(uv[1]-uv2[1]) < limit[1]) {
 					if(lastv) lastv->next= next;
 					else vlist= next;
 					iterv->next= newvlist;
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index a6f05b8c2f6..375ec474382 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -735,7 +735,7 @@ static EnumPropertyItem prop_similar_types[] = {
 
 /* this as a way to compare the ares, perim  of 2 faces thay will scale to different sizes
 *0.5 so smaller faces arnt ALWAYS selected with a thresh of 1.0 */
-#define SCALE_CMP(a,b) ((a+a*thresh >= b) && (a-(a*thresh*0.5) <= b))
+#define SCALE_CMP(a,b) ((a+a*thresh >= b) && (a-(a*thresh*0.5f) <= b))
 
 static int similar_face_select__internal(EditMesh *em, int mode, float thresh)
 {
@@ -828,8 +828,8 @@ static int similar_face_select__internal(EditMesh *em, int mode, float thresh)
 				float angle;
 				for(efa= em->faces.first; efa; efa= efa->next) {
 					if (!(efa->f & SELECT) && !efa->h) {
-						angle= RAD2DEG(angle_v2v2(base_efa->n, efa->n));
-						if (angle/180.0<=thresh) {
+						angle= RAD2DEGF(angle_v2v2(base_efa->n, efa->n));
+						if (angle/180.0f<=thresh) {
 							EM_select_face(efa, 1);
 							selcount++;
 							deselcount--;
@@ -843,10 +843,10 @@ static int similar_face_select__internal(EditMesh *em, int mode, float thresh)
 				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(angle_v2v2(base_efa->n, efa->n));
-						if (angle/180.0<=thresh) {
+						angle= RAD2DEGF(angle_v2v2(base_efa->n, efa->n));
+						if (angle/180.0f<=thresh) {
 							dot=dot_v3v3(efa->cent, base_efa->n);
-							if (fabs(base_dot-dot) <= thresh) {
+							if (fabsf(base_dot-dot) <= thresh) {
 								EM_select_face(efa, 1);
 								selcount++;
 								deselcount--;
@@ -960,7 +960,7 @@ static int similar_edge_select__internal(EditMesh *em, int mode, float thresh)
 					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(angle_v2v2(eed->tmp.f->n, efa->n))/180;
+						eed->tmp.fp= RAD2DEGF(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++;
@@ -990,12 +990,12 @@ static int similar_edge_select__internal(EditMesh *em, int mode, float thresh)
 				for(eed= em->edges.first; eed; eed= eed->next) {
 					if (!(eed->f & SELECT) && !eed->h) {
 						sub_v3_v3v3(dir, eed->v1->co, eed->v2->co);
-						angle= RAD2DEG(angle_v2v2(base_dir, dir));
+						angle= RAD2DEGF(angle_v2v2(base_dir, dir));
 						
-						if (angle>90) /* use the smallest angle between the edges */
-							angle= fabs(angle-180.0f);
+						if (angle>90.0f) /* use the smallest angle between the edges */
+							angle= fabsf(angle-180.0f);
 						
-						if (angle/90.0<=thresh) {
+						if (angle / 90.0f<=thresh) {
 							EM_select_edge(eed, 1);
 							selcount++;
 							deselcount--;
@@ -1024,7 +1024,7 @@ static int similar_edge_select__internal(EditMesh *em, int mode, float thresh)
 						!(eed->f & SELECT) &&
 						!eed->h &&
 						eed->f2==2 &&
-						(fabs(base_eed->tmp.fp-eed->tmp.fp)<=thresh)
+						(fabsf(base_eed->tmp.fp-eed->tmp.fp)<=thresh)
 					) {
 						EM_select_edge(eed, 1);
 						selcount++;
@@ -1038,7 +1038,7 @@ static int similar_edge_select__internal(EditMesh *em, int mode, float thresh)
 					if (
 						!(eed->f & SELECT) &&
 						!eed->h &&
-						(fabs(base_eed->crease-eed->crease) <= thresh)
+						(fabsf(base_eed->crease-eed->crease) <= thresh)
 					) {
 						EM_select_edge(eed, 1);
 						selcount++;
@@ -1160,8 +1160,8 @@ 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(angle_v2v2(base_eve->no, eve->no));
-						if (angle/180.0<=thresh) {
+						angle= RAD2DEGF(angle_v2v2(base_eve->no, eve->no));
+						if (angle/180.0f<=thresh) {
 							eve->f |= SELECT;
 							selcount++;
 							deselcount--;
@@ -2971,7 +2971,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
 	}
 
 	sharpness= RNA_float_get(op->ptr, "sharpness");
-	fsharpness = ((180.0 - sharpness) * M_PI) / 180.0;
+	fsharpness = ((180.0f - sharpness) * (float)M_PI) / 180.0f;
 
 	/* count edges, use tmp.l  */
 	eed= em->edges.first;
@@ -3031,7 +3031,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
 				angle = saacos(efa1[i]->n[0]*efa2[i]->n[0] +
 							   efa1[i]->n[1]*efa2[i]->n[1] +
 							   efa1[i]->n[2]*efa2[i]->n[2]);
-				if (fabs(angle) >= fsharpness)
+				if (fabsf(angle) >= fsharpness)
 					EM_select_edge(eed, 1);
 			}
 		}
@@ -3087,7 +3087,7 @@ static void select_linked_flat_faces(EditMesh *em, wmOperator *op, float sharpne
 		return;
 	}
 
-	fsharpness = ((180.0 - sharpness) * M_PI) / 180.0;
+	fsharpness = ((180.0f - sharpness) * (float)M_PI) / 180.0f;
 
 	i=0;
 	/* count edges, use tmp.l */
@@ -3153,7 +3153,7 @@ static void select_linked_flat_faces(EditMesh *em, wmOperator *op, float sharpne
 							   efa1[i]->n[1]*efa2[i]->n[1] +
 							   efa1[i]->n[2]*efa2[i]->n[2]);
 				/* invalidate: edge too sharp */
-				if (fabs(angle) >= fsharpness)
+				if (fabsf(angle) >= fsharpness)
 					eed->tmp.l = -1;
 			}
 			else {
@@ -3937,10 +3937,10 @@ void EM_recalc_normal_direction(EditMesh *em, int inside, int select)	/* makes f
 		}
 		/* first normal is oriented this way or the other */
 		if(inside) {
-			if(cent[0]*nor[0]+cent[1]*nor[1]+cent[2]*nor[2] > 0.0) flipface(em, startvl);
+			if(cent[0]*nor[0]+cent[1]*nor[1]+cent[2]*nor[2] > 0.0f) flipface(em, startvl);
 		}
 		else {
-			if(cent[0]*nor[0]+cent[1]*nor[1]+cent[2]*nor[2] < 0.0) flipface(em, startvl);
+			if(cent[0]*nor[0]+cent[1]*nor[1]+cent[2]*nor[2] < 0.0f) flipface(em, startvl);
 		}
 
 		eed= startvl->e1;
@@ -4136,15 +4136,15 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 
 						switch(mmd->axis){
 							case 0:
-								if (fabs(eve->co[0]) < mmd->tolerance)
+								if (fabsf(eve->co[0]) < mmd->tolerance)
 									eve->f2 |= 1;
 								break;
 							case 1:
-								if (fabs(eve->co[1]) < mmd->tolerance)
+								if (fabsf(eve->co[1]) < mmd->tolerance)
 									eve->f2 |= 2;
 								break;
 							case 2:
-								if (fabs(eve->co[2]) < mmd->tolerance)
+								if (fabsf(eve->co[2]) < mmd->tolerance)
 									eve->f2 |= 4;
 								break;
 						}
@@ -4157,9 +4157,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 	eed= em->edges.first;
 	while(eed) {
 		if( (eed->v1->f & SELECT) || (eed->v2->f & SELECT) ) {
-			fvec[0]= (eed->v1->co[0]+eed->v2->co[0])/2.0;
-			fvec[1]= (eed->v1->co[1]+eed->v2->co[1])/2.0;
-			fvec[2]= (eed->v1->co[2]+eed->v2->co[2])/2.0;
+			mid_v3_v3v3(fvec, eed->v1->co, eed->v2->co);
 			
 			if((eed->v1->f & SELECT) && eed->v1->f1<255) {
 				eed->v1->f1++;
@@ -4188,14 +4186,14 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 				}
 				
 				adr = eve->tmp.p;
-				fac= 0.5/(float)eve->f1;
+				fac= 0.5f/(float)eve->f1;
 				
 				if(xaxis)
-					eve->co[0]= 0.5*eve->co[0]+fac*adr[0];
+					eve->co[0]= 0.5f*eve->co[0]+fac*adr[0];
 				if(yaxis)
-					eve->co[1]= 0.5*eve->co[1]+fac*adr[1];
+					eve->co[1]= 0.5f*eve->co[1]+fac*adr[1];
 				if(zaxis)
-					eve->co[2]= 0.5*eve->co[2]+fac*adr[2];
+					eve->co[2]= 0.5f*eve->co[2]+fac*adr[2];
 				
 				
 				/* clip if needed by mirror modifier */
@@ -4290,7 +4288,7 @@ static int mesh_noise_exec(bContext *C, wmOperator *op)
 
 	if(tex->type==TEX_STUCCI) {
 		float b2, vec[3];
-		float ofs= tex->turbul/200.0;
+		float ofs= tex->turbul/200.0f;
 		for(eve= em->verts.first; eve; eve= eve->next) {
 			if(eve->f & SELECT) {
 				b2= BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 40387b82205..eb0eb1833a6 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -980,7 +980,7 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 	cent[2]-= obedit->obmat[3][2];
 	mul_m3_v3(imat, cent);
 
-	phi= degr*M_PI/360.0;
+	phi= degr*(float)M_PI/360.0f;
 	phi/= steps;
 	if(ts->editbutflag & B_CLOCKWISE) phi= -phi;
 
@@ -1144,10 +1144,8 @@ static int screw_mesh_exec(bContext *C, wmOperator *op)
 
 	VECCOPY(nor, obedit->obmat[2]);
 
-	if(nor[0]*dvec[0]+nor[1]*dvec[1]+nor[2]*dvec[2]>0.000) {
-		dvec[0]= -dvec[0];
-		dvec[1]= -dvec[1];
-		dvec[2]= -dvec[2];
+	if(nor[0]*dvec[0]+nor[1]*dvec[1]+nor[2]*dvec[2]>0.0f) {
+		negate_v3(dvec);
 	}
 
 	if(spin_mesh(C, op, dvec, turns*steps, 360.0f*turns, 0)) {
@@ -1476,7 +1474,7 @@ static void alter_co(float *co, EditEdge *edge, float smooth, float fractal, int
 		vec1[2]+= fac*nor2[2];
 
 		/* falloff for multi subdivide */
-		smooth *= sqrt(fabs(1.0f - 2.0f*fabs(0.5f-perc)));
+		smooth *= sqrtf(fabs(1.0f - 2.0f*fabsf(0.5f-perc)));
 
 		vec1[0]*= smooth*len;
 		vec1[1]*= smooth*len;
@@ -2675,15 +2673,15 @@ void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float
 					eve->f2= 0;
 					switch(mmd->axis){
 						case 0:
-							if (fabs(eve->co[0]) < mmd->tolerance)
+							if (fabsf(eve->co[0]) < mmd->tolerance)
 								eve->f2 |= 1;
 							break;
 						case 1:
-							if (fabs(eve->co[1]) < mmd->tolerance)
+							if (fabsf(eve->co[1]) < mmd->tolerance)
 								eve->f2 |= 2;
 							break;
 						case 2:
-							if (fabs(eve->co[2]) < mmd->tolerance)
+							if (fabsf(eve->co[2]) < mmd->tolerance)
 								eve->f2 |= 4;
 							break;
 					}
@@ -3226,13 +3224,13 @@ static float measure_facepair(EditVert *v1, EditVert *v2, EditVert *v3, EditVert
 	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(angle_v2v2(noA1, noA2));
+	else normalADiff = RAD2DEGF(angle_v2v2(noA1, noA2));
 		//if(!normalADiff) normalADiff = 179;
 	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(angle_v2v2(noB1, noB2));
+	else normalBDiff = RAD2DEGF(angle_v2v2(noB1, noB2));
 		//if(!normalBDiff) normalBDiff = 179;
 
 	measure += (normalADiff/360) + (normalBDiff/360);
@@ -3247,10 +3245,10 @@ static float measure_facepair(EditVert *v1, EditVert *v2, EditVert *v3, EditVert
 	diff = 0.0;
 
 	diff = (
-		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;
+		fabsf(RAD2DEGF(angle_v2v2(edgeVec1, edgeVec2)) - 90) +
+		fabsf(RAD2DEGF(angle_v2v2(edgeVec2, edgeVec3)) - 90) +
+		fabsf(RAD2DEGF(angle_v2v2(edgeVec3, edgeVec4)) - 90) +
+		fabsf(RAD2DEGF(angle_v2v2(edgeVec4, edgeVec1)) - 90)) / 360;
 	if(!diff) return 0.0;
 
 	measure +=  diff;
@@ -3272,7 +3270,7 @@ static float measure_facepair(EditVert *v1, EditVert *v2, EditVert *v3, EditVert
 	return measure;
 }
 
-#define T2QUV_LIMIT 0.005
+#define T2QUV_LIMIT 0.005f
 #define T2QCOL_LIMIT 3
 static int compareFaceAttribs(EditMesh *em, EditFace *f1, EditFace *f2, EditEdge *eed)
 {