diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-24 21:18:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-24 21:21:13 +0400 |
| commit | 030ae5cadf21239cdd96087fd2bb401e8cf3fe8c (patch) | |
| tree | 286fcfd894d04a1f5cdba6e2eff4fa4a6b184048 | |
| parent | ae71729c8b96772e9767b80246def572913cdc32 (diff) | |
Quiet warnings
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 8b9231204de..f12a0720692 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 e0abe2606e7..72df4e053bc 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 */ |