diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-17 23:57:00 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-17 23:57:00 +0300 |
| commit | 082c9158b2ad961b747ca6a7bd55bc2a79f27b6a (patch) | |
| tree | 39200c1ff454ae23c8fd5b76e4c891d26f92c32c /indra/llappearance/llpolymorph.cpp | |
| parent | 06a76eda6af9fbe36e40a749c44e590ad6cfe363 (diff) | |
| parent | c7ebde4ec9d3909c3c2f6503dc9096406297f26d (diff) | |
Merge branch 'develop' into marchcat/05-develop
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
Diffstat (limited to 'indra/llappearance/llpolymorph.cpp')
| -rw-r--r-- | indra/llappearance/llpolymorph.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp index 8df8a9726f..5ee6649164 100644 --- a/indra/llappearance/llpolymorph.cpp +++ b/indra/llappearance/llpolymorph.cpp @@ -550,12 +550,12 @@ void LLPolyMorphTarget::apply( ESex avatar_sex ) mLastSex = avatar_sex; - // Check for NaN condition (NaN is detected if a variable doesn't equal itself. - if (mCurWeight != mCurWeight) + // Check for NaN condition + if (llisnan(mCurWeight)) { - mCurWeight = 0.0; + mCurWeight = 0.f; } - if (mLastWeight != mLastWeight) + if (llisnan(mLastWeight)) { mLastWeight = mCurWeight+.001f; } |