diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 16:15:23 -0700 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 16:15:23 -0700 |
commit | 173d0fa213f59b872a4a6c34b8668c67b58fdca7 (patch) | |
tree | 3f02cf0344273dd227b356e3e7768d91cf6786f3 /indra/newview/llface.cpp | |
parent | 08c6c5b78d709503e4b5177477046c30495d2d95 (diff) | |
parent | 9298b1abe9f8b5a7230a5788e86affb22747740d (diff) |
Pull in viewer-development because it's painful. Merge with runitai's help.
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f5b217d539..4f3208474d 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -166,8 +166,7 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp) //special value to indicate uninitialized position mIndicesIndex = 0xFFFFFFFF; - - mIndexInTex = 0; + mTexture = NULL; mTEOffset = -1; mTextureIndex = 255; @@ -1636,7 +1635,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, if (!do_xform) { LLFastTimer t(FTM_FACE_TEX_QUICK_NO_XFORM); - LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32)); + S32 tc_size = (num_vertices*2*sizeof(F32)+0xF) & ~0xF; + LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, tc_size); } else { |