diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-20 14:33:36 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 14:33:36 -0500 |
| commit | 4e894bfa316ff4bc2fa64f711b8442b228573f90 (patch) | |
| tree | e5661b6b75ee007b4dc846a802b0ac7f4687f892 /indra/newview | |
| parent | 1762cc49395d2596ab0788b2a4504abaefbe64db (diff) | |
SH-2600 Fix for busted texture animation on bump mapped objects.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/bumpV.glsl | 3 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl index 09ec6ff792..a7738087dc 100644 --- a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl @@ -24,7 +24,6 @@ */ uniform mat4 texture_matrix0; -uniform mat4 texture_matrix1; uniform mat4 modelview_projection_matrix; ATTRIBUTE vec3 position; @@ -39,5 +38,5 @@ void main() //transform vertex gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0); vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; - vary_texcoord1 = (texture_matrix1 * vec4(texcoord1,0,1)).xy; + vary_texcoord1 = (texture_matrix0 * vec4(texcoord1,0,1)).xy; } diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index be12eb800f..610d3f9f99 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1453,11 +1453,10 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL } else { - gGL.getTexUnit(1)->activate(); + gGL.getTexUnit(0)->activate(); gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadMatrix((GLfloat*) params.mTextureMatrix->mMatrix); gPipeline.mTextureMatrixOps++; - gGL.getTexUnit(0)->activate(); } gGL.loadMatrix((GLfloat*) params.mTextureMatrix->mMatrix); @@ -1470,7 +1469,7 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL { if (params.mTexture.notNull()) { - gGL.getTexUnit(diffuse_channel)->bind(params.mTexture) ; + gGL.getTexUnit(diffuse_channel)->bind(params.mTexture); params.mTexture->addTextureStats(params.mVSize); } else |