diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-16 20:17:15 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:18:47 +0200 |
commit | 2fabbc3b4cab40220986f402569af64673cb4cd9 (patch) | |
tree | 3278631a5e3dd19a0af92204e6bfb48702dd04f0 /src/animation/AnimBlendAssociation.cpp | |
parent | Cleanup (diff) | |
download | re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.gz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.bz2 re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.lz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.xz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.zst re3-2fabbc3b4cab40220986f402569af64673cb4cd9.zip |
Diffstat (limited to '')
-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 d94fe2c1..d2214057 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.0f, 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.0f, blendDelta); } return true; |