diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 21:26:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 21:26:55 -0400 |
| commit | f48fe44684a535ed2eefc64c134551ce72e9ecf4 (patch) | |
| tree | 601bfe8f31052620321811582244d12a29d6d7a1 /indra/newview/gltf/buffer_util.h | |
| parent | 2fdca60e61543309d43f5fa99ba2b40f209aec20 (diff) | |
| parent | a50a0e1277386de3456f478127f774fa01cdb578 (diff) | |
Merge pull request #4306 from secondlife/geenz/develop-to-gltf-mesh
Merge develop into glTF mesh import
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; |