diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
| commit | 7ccf02515ad3f9e3bf795d651fe4b3c0d773f353 (patch) | |
| tree | c4adc897c07f652e617e91fbf41c12b823acc808 /indra/newview/llskinningutil.h | |
| parent | 1abf5f18d6afc7ae9e1b1562b92e5c1ce33b722f (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into lua-timers for whitespace fixes.
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 |