diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-06 08:56:32 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-06 08:56:32 -0700 |
| commit | a9ede989158ceaa4914ea48ff6a2027e89fdbda2 (patch) | |
| tree | 20a7294089871f80c1a4057e8e40684c5931a14c /indra/newview/llface.cpp | |
| parent | 8e027971a28e9c4701ec667e52b56bf5deda6ce2 (diff) | |
NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 999bfc48ef..201cb54df6 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1327,7 +1327,7 @@ 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()))) { @@ -1335,6 +1335,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, color.mV[3] = U8 (alpha[tep->getShiny()] * 255); } } + } // INDICES |