diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-16 01:08:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 01:08:13 +0300 |
| commit | d41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch) | |
| tree | 3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /indra/newview/llskinningutil.h | |
| parent | 29be88d60d654193926add496d2d851f7c217356 (diff) | |
| parent | bdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff) | |
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette 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 |