diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
commit | 8df36196215131cbac961f47bfbd4a1b925548cb (patch) | |
tree | 35fe890f1f2e47c9acd0d411925897ee7e3794d6 /indra/llprimitive/llmodel.cpp | |
parent | 4feef5af63f6294249aa50e37fba712cd9ddec91 (diff) | |
parent | d7015a2b9b55907c8447d0051cf5d7ac862aebf7 (diff) |
merge to viewer-developmento
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rw-r--r-- | indra/llprimitive/llmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index cb32a510b8..28ed051c55 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1026,7 +1026,8 @@ void LLModel::setVolumeFaceData( if (tc.get()) { - LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), num_verts*2*sizeof(F32)); + U32 tex_size = (num_verts*2*sizeof(F32)+0xF)&~0xF; + LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), tex_size); } else { |