diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
| commit | 9488baada3c0aec7cfa4256708fdda82861cd502 (patch) | |
| tree | 1f71293b54161733269a6f340574ec4960623d0f /indra/llprimitive/llmodel.cpp | |
| parent | de08d74dc6da594c20aed3673114cbc0ef6d3305 (diff) | |
| parent | 1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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 { |