diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 15:40:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 15:40:12 -0400 |
| commit | 04568da18d2261f3f7b851cf5341b766c9648204 (patch) | |
| tree | 83d5db1c173636bb77ebb33e860fac77ab5d79e8 /indra/newview/gltf/animation.cpp | |
| parent | 18d81e20f0b0044c16615953d7b69d7fb34d3449 (diff) | |
| parent | ff2d79906ccef217194d5d9ec9d7025db03592a8 (diff) | |
Merge pull request #2513 from secondlife/lua-merge-dev
Merge develop branch into Lua project branch.
Diffstat (limited to 'indra/newview/gltf/animation.cpp')
| -rw-r--r-- | indra/newview/gltf/animation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/gltf/animation.cpp b/indra/newview/gltf/animation.cpp index 3dff67d746..31549986af 100644 --- a/indra/newview/gltf/animation.cpp +++ b/indra/newview/gltf/animation.cpp @@ -127,8 +127,8 @@ void Animation::apply(Asset& asset, float time) bool Animation::Sampler::prep(Asset& asset) { Accessor& accessor = asset.mAccessors[mInput]; - mMinTime = accessor.mMin[0]; - mMaxTime = accessor.mMax[0]; + mMinTime = (F32)accessor.mMin[0]; + mMaxTime = (F32)accessor.mMax[0]; mFrameTimes.resize(accessor.mCount); |