diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-08-23 10:27:46 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-08-23 10:27:46 -0700 |
| commit | 375158eb6450a0291ec1a0f55714fbf19a8287eb (patch) | |
| tree | a3fa4bd843f919575aaddf0928eff38bae7d7b04 /indra/newview/gltf/buffer_util.h | |
| parent | 96023976f5af0b9af8e8d066d9ad4eea213f53ee (diff) | |
| parent | 37a04baf104aa394615d8e8286522988ba56c09d (diff) | |
Merge tag 'Second_Life_Release#37a04baf-2025.06' into project/lua_editor
Diffstat (limited to 'indra/newview/gltf/buffer_util.h')
| -rw-r--r-- | indra/newview/gltf/buffer_util.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/gltf/buffer_util.h b/indra/newview/gltf/buffer_util.h index ef9bba8128..be36c5e90b 100644 --- a/indra/newview/gltf/buffer_util.h +++ b/indra/newview/gltf/buffer_util.h @@ -159,6 +159,12 @@ namespace LL } template<> + inline void copyVec3<F32, LLColor4U>(F32* src, LLColor4U& dst) + { + dst.set((U8)(src[0] * 255.f), (U8)(src[1] * 255.f), (U8)(src[2] * 255.f), 255); + } + + template<> inline void copyVec3<U16, LLColor4U>(U16* src, LLColor4U& dst) { dst.set((U8)(src[0]), (U8)(src[1]), (U8)(src[2]), 255); @@ -369,6 +375,11 @@ namespace LL template<class T> inline void copy(Asset& asset, Accessor& accessor, LLStrider<T>& dst) { + if (accessor.mBufferView == INVALID_INDEX) + { + LL_WARNS("GLTF") << "Invalid buffer" << LL_ENDL; + return; + } const BufferView& bufferView = asset.mBufferViews[accessor.mBufferView]; const Buffer& buffer = asset.mBuffers[bufferView.mBuffer]; const U8* src = buffer.mData.data() + bufferView.mByteOffset + accessor.mByteOffset; |