diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-21 06:34:05 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-21 06:34:05 +0800 |
| commit | efef28c1f51c4b8ec53c3742961a11b8c706f17f (patch) | |
| tree | 0d16b22feec42da965f522074f604d02bf6487a4 /indra/newview/gltf/buffer_util.h | |
| parent | b3e00b61a9126a54383cc52c356d0c488d2ec91d (diff) | |
| parent | 787b63f4c29f6ef56f355ec80084458a1bbcfb35 (diff) | |
Merge tag 'Second_Life_Release#787b63f4-2025.06' into 2025.06
Diffstat (limited to 'indra/newview/gltf/buffer_util.h')
| -rw-r--r-- | indra/newview/gltf/buffer_util.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/gltf/buffer_util.h b/indra/newview/gltf/buffer_util.h index be36c5e90b..c231443a9e 100644 --- a/indra/newview/gltf/buffer_util.h +++ b/indra/newview/gltf/buffer_util.h @@ -147,6 +147,12 @@ namespace LL } template<> + inline void copyVec3<F32, LLVector2>(F32* src, LLVector2& dst) + { + dst.set(src[0], src[1]); + } + + template<> inline void copyVec3<F32, vec3>(F32* src, vec3& dst) { dst = vec3(src[0], src[1], src[2]); @@ -375,12 +381,18 @@ namespace LL template<class T> inline void copy(Asset& asset, Accessor& accessor, LLStrider<T>& dst) { - if (accessor.mBufferView == INVALID_INDEX) + if (accessor.mBufferView == INVALID_INDEX + || accessor.mBufferView >= asset.mBufferViews.size()) { LL_WARNS("GLTF") << "Invalid buffer" << LL_ENDL; return; } const BufferView& bufferView = asset.mBufferViews[accessor.mBufferView]; + if (bufferView.mBuffer >= asset.mBuffers.size()) + { + LL_WARNS("GLTF") << "Invalid buffer view" << LL_ENDL; + return; + } const Buffer& buffer = asset.mBuffers[bufferView.mBuffer]; const U8* src = buffer.mData.data() + bufferView.mByteOffset + accessor.mByteOffset; |