summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-08 01:08:09 -0500
committerDave Parks <davep@lindenlab.com>2011-06-08 01:08:09 -0500
commit9b1c284d4cb678c0a7800505ac5fa3ab3e6ba095 (patch)
tree2d0429db3c22fa3e32b201435e0ae1757edf50bc /indra/newview/lldrawpoolbump.cpp
parentedc6ca726be6862d9e070b4ee1bfd706f8040b16 (diff)
SH-1678 Fix for busted fullbright shiny.
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r--indra/newview/lldrawpoolbump.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 8985d3680e..813b3820ee 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -537,6 +537,12 @@ void LLDrawPoolBump::beginFullbrightShiny()
gGL.getTexUnit(cube_channel)->bind(cube_map);
gGL.getTexUnit(0)->activate();
}
+
+ if (mVertexShaderLevel > 1)
+ { //indexed texture rendering, channel 0 is always diffuse
+ diffuse_channel = 0;
+ }
+
mShiny = TRUE;
}