diff options
| author | Brad Linden <brad@lindenlab.com> | 2022-12-12 17:59:34 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2022-12-12 17:59:34 -0800 |
| commit | eb526fec0aadcaf30363fdfb1e253a609bf83acc (patch) | |
| tree | 6071628f41ca793007b645aa30d255044ddbfe43 /indra/llprimitive/llmodel.h | |
| parent | c9c611fd12f55ac6d6717ba17139ba61a6db581f (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index a6ab96ab18..2aaaa4e8c1 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -57,6 +57,8 @@ public: mutable std::vector<S32> mJointNums; typedef std::vector<LLMatrix4a, boost::alignment::aligned_allocator<LLMatrix4a, 16>> matrix_list_t; matrix_list_t mInvBindMatrix; + + // bones/joints position overrides matrix_list_t mAlternateBindMatrix; LL_ALIGN_16(LLMatrix4a mBindShapeMatrix); |