diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-19 05:10:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-19 05:10:05 +0400 |
| commit | 4924abaad66acc966158b67f4843e12afde75352 (patch) | |
| tree | d92bf99c39c13561457149a0d1616d2b4a0ae5aa /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 14ddf19ad20553f81e014e45846b370237df28c3 (diff) | |
replace fabs with fabsf where both input and output are floats.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 */ |