diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
| commit | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (patch) | |
| tree | 7959f729f94b8fcd85bb3b32a7b5bb271c746b47 /indra/newview/llface.cpp | |
| parent | 39544a3b06e3221602444eb81c7df8c1030c6bb5 (diff) | |
| parent | fafa21315f043ab51e3373e825c85646685778a6 (diff) | |
Merged Graham's stuff amongst others.
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); } |