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
commit04fceb5f006d6f3b9b36996382e4c1483a599dde (patch)
tree28085d2cded5908ce654d9ef201f3a67cf804848 /indra/newview/llface.cpp
parentf1975f0fe9d09b0c9cffa94dad31de2c9f0d4849 (diff)
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 08a16c9c33..dad62dd045 100644
--- 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);
}
}