diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-19 17:24:16 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-19 17:24:16 -0700 |
| commit | 2d514e4b10025dc37c20db7db821e621dcdcaaf1 (patch) | |
| tree | dd630aed52f3f42bd0b396f5881194fa3114994c /indra/newview/lldrawpoolwater.cpp | |
| parent | 721df1f942ba7c5d78c7f974ed564aac431844f7 (diff) | |
SL-10763
Fix broken logic for alpha drawpool when rendering with basic shaders off.
Force unbind of 2nd tex unit that we use during water rendering.
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index abda2d45fb..4c95fb0a0f 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -271,9 +271,9 @@ void LLDrawPoolWater::render(S32 pass) glDisable(GL_TEXTURE_GEN_S); //texture unit 1 glDisable(GL_TEXTURE_GEN_T); //texture unit 1 - gGL.getTexUnit(1)->activate(); - gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE); - gGL.getTexUnit(1)->disable(); + gGL.getTexUnit(2)->activate(); + gGL.getTexUnit(2)->unbind(LLTexUnit::TT_TEXTURE); + gGL.getTexUnit(2)->disable(); glDisable(GL_TEXTURE_GEN_S); //texture unit 1 glDisable(GL_TEXTURE_GEN_T); //texture unit 1 |