diff options
| author | callum_linden <none@none> | 2013-05-06 19:45:23 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-05-06 19:45:23 -0700 |
| commit | 1e7b133e75c2c93290db6b0c9db721e95849ff30 (patch) | |
| tree | 0a329819a22244fb84a0f25d2f3e9c04f0d3dd29 /indra/newview/llface.cpp | |
| parent | 90d3045c7f693f599dac64c1845ddc639150fe1e (diff) | |
| parent | 9609fa72594dd71f8be6417b5a889cfac7112cfd (diff) | |
Merge with lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 08a16c9c33..77dd1fe607 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1327,13 +1327,15 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, 0.75f }; - if ((!LLPipeline::sRenderDeferred || !mat) && + if ((!LLPipeline::sRenderDeferred || !mat || mat->getSpecularID().isNull()) && getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) { + llassert(tep->getShiny() <= 3); color.mV[3] = U8 (alpha[tep->getShiny()] * 255); } } + } // INDICES |