summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-05-03 09:16:15 -0700
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-05-03 09:16:15 -0700
commit9187a06d0bc70ea7670192a5fe53f75ef6f36259 (patch)
tree9e902c03d217e9698e7707406defa259b87cc5a3 /indra/newview/llface.cpp
parent419a06036b8ec172bdfa91ab7f1f7691cdbdb2ca (diff)
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
Diffstat (limited to 'indra/newview/llface.cpp')
-rwxr-xr-xindra/newview/llface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 879dbf8470..999bfc48ef 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1331,6 +1331,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
getPoolType() != LLDrawPool::POOL_ALPHA &&
(LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny())))
{
+ llassert(tep->getShiny() <= 3);
color.mV[3] = U8 (alpha[tep->getShiny()] * 255);
}
}