diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
| commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
| tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/llface.cpp | |
| parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index cfb4147e71..4108d69e82 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1742,14 +1742,22 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLVector4a texIdx; - F32 index = (F32) (mTextureIndex < 255 ? mTextureIndex : 0); + U8 index = mTextureIndex < 255 ? mTextureIndex : 0; + + F32 val = 0.f; + U8* vp = (U8*) &val; + vp[0] = index; + vp[1] = 0; + vp[2] = 0; + vp[3] = 0; + llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); LLVector4Logical mask; mask.clear(); mask.setElement<3>(); - texIdx.set(0,0,0,index); + texIdx.set(0,0,0,val); { LLFastTimer t(FTM_FACE_POSITION_STORE); |