diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-05-20 14:36:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-20 14:36:14 -0700 |
| commit | a1d7d2abc304b59fbca26f0ca23c926762be10a1 (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/newview/llskinningutil.h | |
| parent | f51797f088808029745161854aa86b775f041a64 (diff) | |
| parent | 3a212d9608492ae64a3a32f80790371b90be9e9e (diff) | |
Merge pull request #1532 from secondlife/roxie/webrtc-voice
[WebRTC] Merge from main
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 |