diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-09-27 03:35:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 04:35:42 +0300 |
| commit | d3833b6d618ff05f44c28eab67bc91ee5a3ba92d (patch) | |
| tree | 8fe3b732546d4aa2734781f8a15abe7fd5a5d8ce /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | b043ed4baf8ddfc9e45c0c484e56e9089d5e9c14 (diff) | |
Fix lerp issues and eliminate flerp in favor of std::lerp (#2712)
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 1a092234fb..955b5e7730 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -777,7 +777,7 @@ void LLPanelPrimMediaControls::draw() else if(mFadeTimer.getStarted()) { F32 time = mFadeTimer.getElapsedTimeF32(); - alpha *= llmax(flerp(1.0, 0.0, time / mControlFadeTime), 0.0f); + alpha *= llmax(lerp(1.0f, 0.0f, time / mControlFadeTime), 0.0f); if(time >= mControlFadeTime) { |