diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
| commit | 25f8cbece402c0987e2035eb7721e21a9d2761c3 (patch) | |
| tree | f2408e7d1f7b58f49f8cefc5dda7dd56d08c98f8 /indra/llprimitive/llmodel.cpp | |
| parent | 6f4d7c2d6d363aee60d2f3d1fe4ed4a251aaa11b (diff) | |
| parent | f378d2f95ad751ccf7456f79baba61d6c39f5c36 (diff) | |
Merge branch 'develop' into rlva/base
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 15087a7255..9908a155f2 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1547,6 +1547,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(); } |