diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:45:16 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:45:16 +0300 |
| commit | 9fe758e8bc747ff4fe7d4c5dcd1d7914aaa53195 (patch) | |
| tree | e25c765db5efeb8ef482ca2706637c25f23672ec /indra/newview/llskinningutil.h | |
| parent | b6883636ffe7b14f3adba325591222e6a4940772 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/llskinningutil.h')
| -rw-r--r-- | indra/newview/llskinningutil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llskinningutil.h b/indra/newview/llskinningutil.h index 549aa6a29f..efe7c85997 100644 --- a/indra/newview/llskinningutil.h +++ b/indra/newview/llskinningutil.h @@ -67,7 +67,6 @@ namespace LLSkinningUtil void initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar); void updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *avatar, LLVolumeFace& vol_face); - void updateRiggingInfo_(LLMeshSkinInfo* skin, LLVOAvatar *avatar, S32 num_verts, LLVector4a* weights, LLVector4a* positions, U8* joint_indices, LLJointRiggingInfoTab &rig_info_tab); LLQuaternion getUnscaledQuaternion(const LLMatrix4& mat4); }; |