diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-07-11 15:17:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-07-11 15:17:13 -0500 |
| commit | 997b360747bb21564f0ef89c3b3e065ea3ec0716 (patch) | |
| tree | cfc63cf9ecb003081c75001ce47b4fa13e1dceeb /indra/newview | |
| parent | f7f27e4f2617c3656b273117543ecd92ef5ac495 (diff) | |
MAINT-794 Fix for assert on loading some types of objects before their parents.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/llface.cpp | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl index 7c0699d72f..ca29bf3143 100644 --- a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl @@ -23,9 +23,9 @@ * $/LicenseInfo$ */ -ATTRIBUTE ivec4 texture_index; +ATTRIBUTE int texture_index; -VARYING_FLAT ivec4 vary_texture_index; +VARYING_FLAT int vary_texture_index; void passTextureIndex() { diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 49a20d5ef9..2d84c5d7de 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1945,15 +1945,12 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLVector4a texIdx; - U8 index = mTextureIndex < 255 ? mTextureIndex : 0; + S32 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; - + S32* vp = (S32*) &val; + *vp = index; + llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); LLVector4Logical mask; |