diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
| commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
| tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/newview/llviewerjointmesh.cpp | |
| parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
| parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) | |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
| -rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index f029ae5302..5d1aa870a3 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -729,8 +729,10 @@ void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_w F32* vw = (F32*) vertex_weightsp.get(); F32* cw = (F32*) clothing_weightsp.get(); - LLVector4a::memcpyNonAliased16(tc, (F32*) mMesh->getTexCoords(), num_verts*2*sizeof(F32)); - LLVector4a::memcpyNonAliased16(vw, (F32*) mMesh->getWeights(), num_verts*sizeof(F32)); + S32 tc_size = (num_verts*2*sizeof(F32)+0xF) & ~0xF; + LLVector4a::memcpyNonAliased16(tc, (F32*) mMesh->getTexCoords(), tc_size); + S32 vw_size = (num_verts*sizeof(F32)+0xF) & ~0xF; + LLVector4a::memcpyNonAliased16(vw, (F32*) mMesh->getWeights(), vw_size); LLVector4a::memcpyNonAliased16(cw, (F32*) mMesh->getClothingWeights(), num_verts*4*sizeof(F32)); } |