diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:26:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:26:03 +0800 |
| commit | b024b356c75528b4d2688016d49a11e1270fb48d (patch) | |
| tree | 7913efa6bdcc38510f5e3743887c295a213f77c0 /indra/newview/llskinningutil.cpp | |
| parent | 7f48cc4f84a6e5b525570b7e1ccfad52187b6420 (diff) | |
| parent | 1a6e3286110f9e54611715b44c5f8b47d08dc310 (diff) | |
Merge tag 'Second_Life_Project#1a6e3286-GLTF_Mesh_Import' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llskinningutil.cpp')
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index 43836a420b..47f58afa00 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -360,7 +360,8 @@ void LLSkinningUtil::updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *a { rig_info_tab[joint_num].setIsRiggedTo(true); - const LLMatrix4a& mat = skin->mBindPoseMatrix[joint_index]; + size_t bind_poses_size = skin->mBindPoseMatrix.size(); + const LLMatrix4a& mat = bind_poses_size > joint_index ? skin->mBindPoseMatrix[joint_index] : LLMatrix4a::identity(); LLVector4a pos_joint_space; mat.affineTransform(pos, pos_joint_space); |