diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
| commit | d3928405e3498fabd9215da96fcd0d72e71e83e1 (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/newview/lldrawpoolavatar.h | |
| parent | c1e3f778cb377999edf49764088f3f23a2302afc (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
merge, close develop branch
--HG--
branch : develop
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index b9d2204052..af063ee74e 100755 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -134,6 +134,8 @@ public: void endDeferredRiggedBump(); void getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer>& buffer, U32 data_mask, const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face); + static void initSkinningMatrixPalette(LLMatrix4* mat, S32 count, const LLMeshSkinInfo* skin, LLVOAvatar *avatar); + static void getPerVertexSkinMatrix(F32* weights, LLMatrix4a* mat, bool handle_bad_scale, LLMatrix4a& final_mat); void updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* facep, const LLMeshSkinInfo* skin, |