diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-18 15:04:26 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-18 15:04:26 -0600 |
| commit | 5c690db63ff118b6bc66fe1607624a59f4162b30 (patch) | |
| tree | 1e0222d2d162301194f6a02a1e0976cf969d5e36 /indra/newview/llface.cpp | |
| parent | 50112c163a1d7fcea4bd3be815d6eddd7d44364e (diff) | |
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index eab3dcfadd..6dbeae6677 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1658,6 +1658,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, while(dst < end); F32 index = (F32) (mTextureIndex < 255 ? mTextureIndex : 0); + + llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); F32 *index_dst = (F32*) vertices; F32 *index_end = (F32*) end; |