diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
| commit | 6d51e91895a7f2435c46a876410ccc6c63fe8c82 (patch) | |
| tree | f2b48ebd99cb414227bf365f47665b8d4baa752b /indra/newview/llskinningutil.h | |
| parent | d1b5917bb9c92e4e47eba19b43781e4d1328b1ca (diff) | |
| parent | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (diff) | |
Merge tag '7.1.7-release'
source for viewer 7.1.7.8974243247
Diffstat (limited to 'indra/newview/llskinningutil.h')
| -rw-r--r-- | indra/newview/llskinningutil.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llskinningutil.h b/indra/newview/llskinningutil.h index 807418f983..bd2f8ea04e 100644 --- a/indra/newview/llskinningutil.h +++ b/indra/newview/llskinningutil.h @@ -1,4 +1,4 @@ -/** +/** * @file llskinningutil.h * @brief Functions for mesh object skinning * @author vir@lindenlab.com @@ -53,13 +53,13 @@ namespace LLSkinningUtil LLMatrix4a* mat, LLMatrix4a& final_mat, LLMatrix4a* src) - { + { final_mat.clear(); src[0].setMul(mat[idx[0]], weights[0]); src[1].setMul(mat[idx[1]], weights[1]); final_mat.add(src[0]); final_mat.add(src[1]); - src[2].setMul(mat[idx[2]], weights[2]); + src[2].setMul(mat[idx[2]], weights[2]); src[3].setMul(mat[idx[3]], weights[3]); final_mat.add(src[2]); final_mat.add(src[3]); @@ -67,7 +67,7 @@ namespace LLSkinningUtil void initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar); void updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *avatar, LLVolumeFace& vol_face); - LLQuaternion getUnscaledQuaternion(const LLMatrix4& mat4); + LLQuaternion getUnscaledQuaternion(const LLMatrix4& mat4); }; #endif |