diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-04-10 00:28:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-04-10 00:28:03 -0500 |
| commit | aaad46c18b2b49a06cec65afdb0077690f6e80a7 (patch) | |
| tree | 4ef932374ddce8c66847597f7ea33b9add75492d /indra/newview/llface.cpp | |
| parent | 8f84d75ae42f4bb6f3305c64e95bc4a070b774a6 (diff) | |
| parent | 78d23e66425265e43584c6c4fd4fce9c675f4771 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 3d6acedd02..8f8b35c578 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1311,6 +1311,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, { if (tep) { + LLMaterial* mat = tep->getMaterialParams().get(); + GLfloat alpha[4] = { 0.00f, @@ -1319,7 +1321,9 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, 0.75f }; - if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) + if ((!LLPipeline::sRenderDeferred || !mat) && + getPoolType() != LLDrawPool::POOL_ALPHA && + (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) { color.mV[3] = U8 (alpha[tep->getShiny()] * 255); } |