quiet -Wdouble-promotion warnings

2 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 95daa11d97f..5060f55c533 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4691,7 +4691,7 @@ static int createSlideVerts(TransInfo *t)
 							uv_new = tf->uv[k];
 
 							if (ev->tmp.l) {
-								if (fabsf(suv->origuv[0]-uv_new[0]) > 0.0001f || fabs(suv->origuv[1]-uv_new[1]) > 0.0001f) {
+								if (fabsf(suv->origuv[0]-uv_new[0]) > 0.0001f || fabsf(suv->origuv[1]-uv_new[1]) > 0.0001f) {
 									ev->tmp.l = -1; /* Tag as invalid */
 									BLI_linklist_free(suv->fuv_list,NULL);
 									suv->fuv_list = NULL;
@@ -5462,7 +5462,7 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
 		else
 #endif
 		{
-			val= (float)( floor(val+0.5f) );
+			val= floorf(val+0.5f);
 		}
 		
 		/* convert frame out of nla-action time */
@@ -5548,13 +5548,13 @@ static void headerTimeTranslate(TransInfo *t, char *str)
 		/* apply snapping + frame->seconds conversions */
 		if (autosnap == SACTSNAP_STEP) {
 			if (doTime)
-				val= floor(val/secf + 0.5f);
+				val= floor((double)val/secf + 0.5f);
 			else
 				val= floor(val + 0.5f);
 		}
 		else {
 			if (doTime)
-				val= val / secf;
+				val= (float)((double)val / secf);
 		}
 		
 		if (autosnap == SACTSNAP_FRAME)
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 0e053e68496..3a8c2e80351 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -197,8 +197,9 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 						
 						clip = 0;
 						if(axis & 1) {
-							if(fabs(iloc[0])<=tolerance[0] ||
-							   loc[0]*iloc[0]<0.0f) {
+							if(fabsf(iloc[0])<=tolerance[0] ||
+							   loc[0]*iloc[0]<0.0f)
+							{
 								loc[0]= 0.0f;
 								clip = 1;
 							}
@@ -206,14 +207,16 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 						
 						if(axis & 2) {
 							if(fabs(iloc[1])<=tolerance[1] ||
-							   loc[1]*iloc[1]<0.0f) {
+							   loc[1]*iloc[1]<0.0f)
+							{
 								loc[1]= 0.0f;
 								clip = 1;
 							}
 						}
 						if(axis & 4) {
 							if(fabs(iloc[2])<=tolerance[2] ||
-							   loc[2]*iloc[2]<0.0f) {
+							   loc[2]*iloc[2]<0.0f)
+							{
 								loc[2]= 0.0f;
 								clip = 1;
 							}