diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-02 17:43:40 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:14:28 +0200 |
commit | 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 (patch) | |
tree | aa190341ec4d5ee449c80c20fea3c09e4f655532 /src/animation/AnimBlendAssociation.cpp | |
parent | af5bd951aeb43c341d5126bc4141992169e46d57 (diff) |
Cleanup
Diffstat (limited to 'src/animation/AnimBlendAssociation.cpp')
-rw-r--r-- | src/animation/AnimBlendAssociation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp index 7273c846..d94fe2c1 100644 --- a/src/animation/AnimBlendAssociation.cpp +++ b/src/animation/AnimBlendAssociation.cpp @@ -185,7 +185,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta) if(blendAmount <= 0.0f && blendDelta < 0.0f){ // We're faded out and are not fading in blendAmount = 0.0f; - blendDelta = Max(0.0, blendDelta); + blendDelta = max(0.0, blendDelta); if(flags & ASSOC_DELETEFADEDOUT){ if(callbackType == CB_FINISH || callbackType == CB_DELETE) callback(this, callbackArg); @@ -197,7 +197,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta) if(blendAmount > 1.0f){ // Maximally faded in, clamp values blendAmount = 1.0f; - blendDelta = Min(0.0, blendDelta); + blendDelta = min(0.0, blendDelta); } return true; |