livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4581 Crash on LL::GLTF::copy 

Tried to initialize LLVector2 TexCoords with vector3 data?
master
Andrey Kleshchev 2025-08-20 20:54:28 +03:00 committed by Andrey Kleshchev
parent a27acaf356
commit e01c447745
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/gltf/buffer_util.h
View File

@ -146,6 +146,12 @@ namespace LL
dst.set(src[0], src[1]); dst.set(src[0], src[1]);
} }
template<>
inline void copyVec3<F32, LLVector2>(F32* src, LLVector2& dst)
{
dst.set(src[0], src[1]);
}
template<> template<>
inline void copyVec3<F32, vec3>(F32* src, vec3& dst) inline void copyVec3<F32, vec3>(F32* src, vec3& dst)
{ {
@ -375,12 +381,18 @@ namespace LL
template<class T> template<class T>
inline void copy(Asset& asset, Accessor& accessor, LLStrider<T>& dst) 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; LL_WARNS("GLTF") << "Invalid buffer" << LL_ENDL;
return; return;
} }
const BufferView& bufferView = asset.mBufferViews[accessor.mBufferView]; 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 Buffer& buffer = asset.mBuffers[bufferView.mBuffer];
const U8* src = buffer.mData.data() + bufferView.mByteOffset + accessor.mByteOffset; const U8* src = buffer.mData.data() + bufferView.mByteOffset + accessor.mByteOffset;