summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-23 12:47:52 -0500
committerDave Parks <davep@lindenlab.com>2013-05-23 12:47:52 -0500
commit933d4c40f42babf74320dca70ac08009b8577fa1 (patch)
treec1c7f29374232a21ec4e4dc567ddc72226b70c36 /indra/newview/lldrawpoolbump.cpp
parent4c522f82124328157e273bbc0813198d85a15f0f (diff)
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rwxr-xr-xindra/newview/lldrawpoolbump.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index cb40cf2039..cbd65a88e7 100755
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -513,7 +513,14 @@ void LLDrawPoolBump::beginFullbrightShiny()
}
else
{
- shader = &gObjectFullbrightShinyProgram;
+ if (LLPipeline::sRenderDeferred)
+ {
+ shader = &gDeferredFullbrightShinyProgram;
+ }
+ else
+ {
+ shader = &gObjectFullbrightShinyProgram;
+ }
}
LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL;