diff options
author | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
---|---|---|
committer | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
commit | 9ac0b3da77ca0c54161803f23cc37c09e871799d (patch) | |
tree | ec9575c248d6e9cd01d8d15471ceb952c7dba738 /indra/llprimitive/llmodel.h | |
parent | 5f1c8d311904bd3937f5ba70476e16233f7d21c1 (diff) | |
parent | f39be1dfd30032f10f21cccc29e93c1c49f01df5 (diff) |
SL-18068: Merged DRTVWR-565-maint-P into sl-18068
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); |