blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Quiet warnings

This commit is contained in:
Campbell Barton 2014-04-25 03:18:19 +10:00
parent ae71729c8b
commit 030ae5cadf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/idprop.c
View File

@ -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);

2
source/blender/editors/transform/transform.c
View File

@ -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 */