diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
| commit | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (patch) | |
| tree | b3469444ea8dabe4e76a8a265ac086a9db78891c /indra/newview/llskinningutil.h | |
| parent | 9bf2dfbb39032d7407295089cf181de0987083e5 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
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 |