diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-08 15:18:48 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-08 15:18:48 -0700 |
| commit | b082ed28e8936fa378160be3076393f295c26c1b (patch) | |
| tree | 6dfd40478bbcf0a03e4be12d3d17c73ad161d7d2 /indra/newview/lldrawpoolavatar.h | |
| parent | d038ed07f0978aa9f43e488bd525987d20543d1c (diff) | |
| parent | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff) | |
Pulled merge from Vir's Bento.
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index af063ee74e..79d16c26bc 100755 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -134,8 +134,10 @@ public: void endDeferredRiggedBump(); void getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer>& buffer, U32 data_mask, const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face); + static U32 getMaxJointCount(); + static U32 getMeshJointCount(const LLMeshSkinInfo *skin); 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); + static void getPerVertexSkinMatrix(F32* weights, LLMatrix4a* mat, bool handle_bad_scale, LLMatrix4a& final_mat, U32 max_joints); void updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* facep, const LLMeshSkinInfo* skin, |