[Bf-blender-cvs] [030ae5c] master: Quiet warnings

[Campbell Barton]

Commit: 030ae5cadf21239cdd96087fd2bb401e8cf3fe8c
Author: Campbell Barton
Date:   Fri Apr 25 03:18:19 2014 +1000
https://developer.blender.org/rB030ae5cadf21239cdd96087fd2bb401e8cf3fe8c

Quiet warnings

===================================================================

M	source/blender/blenkernel/intern/idprop.c
M	source/blender/editors/transform/transform.c

===================================================================

diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 8b92312..f12a072 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -825,7 +825,7 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is
 			{
 				float p1 = IDP_Float(prop1);
 				float p2 = IDP_Float(prop2);
-				if ((p1 != p2) && ((fabs(p1 - p2) / max_ff(p1, p2)) < 0.001)) {
+				if ((p1 != p2) && ((fabsf(p1 - p2) / max_ff(p1, p2)) < 0.001f)) {
 					printf("WARNING: Comparing two float properties that have nearly the same value (%f vs. %f)\n", p1, p2);
 					printf("    p1: ");
 					IDP_spit(prop1);
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index e0abe26..72df4e0 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -7223,7 +7223,7 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
 			val = floorf(val + 0.5);
 		}
 		else if (autosnap == SACTSNAP_SECOND) {
-			val = (float)(floor((val / secf) + 0.5f) * secf);
+			val = (float)(floor((val / secf) + 0.5) * secf);
 		}
 		
 		/* convert frame out of nla-action time */