From 4924abaad66acc966158b67f4843e12afde75352 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Nov 2011 01:10:05 +0000 Subject: replace fabs with fabsf where both input and output are floats. --- source/blender/blenkernel/intern/anim_sys.c | 8 ++++---- source/blender/blenkernel/intern/camera.c | 2 +- source/blender/blenkernel/intern/fcurve.c | 4 ++-- source/blender/blenkernel/intern/mball.c | 12 ++++++------ source/blender/blenkernel/intern/nla.c | 4 ++-- source/blender/blenkernel/intern/object.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 63ab74fc105..b32421a6b3d 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1373,17 +1373,17 @@ void animsys_evaluate_action (PointerRNA *ptr, bAction *act, AnimMapper *remap, static float nlastrip_get_influence (NlaStrip *strip, float cframe) { /* sanity checks - normalise the blendin/out values? */ - strip->blendin= (float)fabs(strip->blendin); - strip->blendout= (float)fabs(strip->blendout); + strip->blendin= fabsf(strip->blendin); + strip->blendout= fabsf(strip->blendout); /* result depends on where frame is in respect to blendin/out values */ if (IS_EQ(strip->blendin, 0)==0 && (cframe <= (strip->start + strip->blendin))) { /* there is some blend-in */ - return (float)fabs(cframe - strip->start) / (strip->blendin); + return fabsf(cframe - strip->start) / (strip->blendin); } else if (IS_EQ(strip->blendout, 0)==0 && (cframe >= (strip->end - strip->blendout))) { /* there is some blend-out */ - return (float)fabs(strip->end - cframe) / (strip->blendout); + return fabsf(strip->end - cframe) / (strip->blendout); } else { /* in the middle of the strip, we should be full strength */ diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index a8b1c2aa04f..b0c91e76b8c 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -158,7 +158,7 @@ float object_camera_dof_distance(Object *ob) normalize_m4(obmat); invert_m4_m4(imat, obmat); mul_m4_m4m4(mat, cam->dof_ob->obmat, imat); - return (float)fabs(mat[3][2]); + return fabsf(mat[3][2]); } return cam->YF_dofdist; } diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 4bb9dc47fda..d01e3de0796 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -1707,8 +1707,8 @@ void correct_bezpart (float *v1, float *v2, float *v3, float *v4) * - len2 = length of handle of end key */ len= v4[0]- v1[0]; - len1= (float)fabs(h1[0]); - len2= (float)fabs(h2[0]); + len1= fabsf(h1[0]); + len2= fabsf(h2[0]); /* if the handles have no length, no need to do any corrections */ if ((len1+len2) == 0.0f) diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d8628e526ef..3e3f16dcfa3 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -1781,11 +1781,11 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */ calc_mballco(mainb[a], vec); - size= (float)fabs( vec[0] ); + size= fabsf( vec[0] ); if( size > totsize ) totsize= size; - size= (float)fabs( vec[1] ); + size= fabsf( vec[1] ); if( size > totsize ) totsize= size; - size= (float)fabs( vec[2] ); + size= fabsf( vec[2] ); if( size > totsize ) totsize= size; vec[0]= mainb[a]->x - mainb[a]->rad; @@ -1794,11 +1794,11 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */ calc_mballco(mainb[a], vec); - size= (float)fabs( vec[0] ); + size= fabsf( vec[0] ); if( size > totsize ) totsize= size; - size= (float)fabs( vec[1] ); + size= fabsf( vec[1] ); if( size > totsize ) totsize= size; - size= (float)fabs( vec[2] ); + size= fabsf( vec[2] ); if( size > totsize ) totsize= size; } diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 8a908097862..fd184b9def4 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -400,7 +400,7 @@ static float nlastrip_get_frame_actionclip (NlaStrip *strip, float cframe, short /* scaling */ if (IS_EQF(strip->scale, 0.0f)) strip->scale= 1.0f; - scale = (float)fabs(strip->scale); /* scale must be positive - we've got a special flag for reversing */ + scale = fabsf(strip->scale); /* scale must be positive - we've got a special flag for reversing */ /* length of referenced action */ actlength = strip->actend - strip->actstart; @@ -1087,7 +1087,7 @@ void BKE_nlastrip_set_active (AnimData *adt, NlaStrip *strip) short BKE_nlastrip_within_bounds (NlaStrip *strip, float min, float max) { const float stripLen= (strip) ? strip->end - strip->start : 0.0f; - const float boundsLen= (float)fabs(max - min); + const float boundsLen= fabsf(max - min); /* sanity checks */ if ((strip == NULL) || IS_EQF(stripLen, 0.0f) || IS_EQF(boundsLen, 0.0f)) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index dedf2675ff6..3c0a82667a8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1901,7 +1901,7 @@ static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[ int a; // include framerate - fac1= ( 1.0f / (1.0f + (float)fabs(ob->sf)) ); + fac1= ( 1.0f / (1.0f + fabsf(ob->sf)) ); if(fac1 >= 1.0f) return 0; fac2= 1.0f-fac1; -- cgit v1.2.3