diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-28 18:01:02 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-10-18 18:38:25 +0800 |
| commit | ad3cbb9f75c4ea7f0473225afc034c403b54fc82 (patch) | |
| tree | 4e4239e97a405d2820e26a4f2215ad8ccb88af7e /indra/llprimitive/llmodel.cpp | |
| parent | 7fdb350e487acc35b26de6e243ff27f94185d3a5 (diff) | |
| parent | 64c055f9be03861661f8c211ae36ba0db489b12d (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index bcd1ee57db..d60d6cdaac 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1543,6 +1543,13 @@ void LLMeshSkinInfo::fromLLSD(LLSD& skin) mLockScaleIfJointPosition = false; } + // combine mBindShapeMatrix and mInvBindMatrix into mBindPoseMatrix + mBindPoseMatrix.resize(mInvBindMatrix.size()); + for (U32 i = 0; i < mInvBindMatrix.size(); ++i) + { + matMul(mBindShapeMatrix, mInvBindMatrix[i], mBindPoseMatrix[i]); + } + updateHash(); } |