diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-09-27 17:29:22 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-09-27 17:29:22 -0400 |
| commit | e6297ab3d6262014d3b501703154437bea523be1 (patch) | |
| tree | 266a9936ed7240a4cf28d1d21cf850e9fa9e5138 /indra/llprimitive | |
| parent | 996861e21bf165d73ebd80eae50ad1e8f61ee55d (diff) | |
SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette()
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 1 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 6637f41966..7677dc9e27 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1399,6 +1399,7 @@ void LLMeshSkinInfo::fromLLSD(LLSD& skin) for (U32 i = 0; i < skin["joint_names"].size(); ++i) { mJointNames.push_back(skin["joint_names"][i]); + mJointNums.push_back(-1); } } diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index c23d65bc8f..2034686529 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -49,6 +49,7 @@ public: LLUUID mMeshID; std::vector<std::string> mJointNames; + mutable std::vector<S32> mJointNums; std::vector<LLMatrix4> mInvBindMatrix; std::vector<LLMatrix4> mAlternateBindMatrix; std::vector<U32> mJointRemap; |