summaryrefslogtreecommitdiff
path: root/indra/newview/llskinningutil.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
commitd1353441f91d5776e1f4e72666f7c9de96eecca5 (patch)
treecd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/newview/llskinningutil.cpp
parent2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff)
parent136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff)
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into gltf-mesh-import
Diffstat (limited to 'indra/newview/llskinningutil.cpp')
-rw-r--r--indra/newview/llskinningutil.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index cee43f3cff..43836a420b 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -135,6 +135,12 @@ void LLSkinningUtil::initSkinningMatrixPalette(
initJointNums(const_cast<LLMeshSkinInfo*>(skin), avatar);
+ if (skin->mInvBindMatrix.size() < count )
+ {
+ // faulty model? mInvBindMatrix.size() should have matched mJointNames.size()
+ return;
+ }
+
LLMatrix4a world[LL_CHARACTER_MAX_ANIMATED_JOINTS];
for (S32 j = 0; j < count; ++j)