diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-02 12:35:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-02 12:35:48 -0500 |
| commit | 6bb9c2720e42be43741e470fb5b347686e584b6b (patch) | |
| tree | f91c3bb810f4b5ff48ed1231ff563187f3e91d1a /indra/newview/llface.cpp | |
| parent | 90c2be46bf677db00207a45478ade362b90d7a6c (diff) | |
NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 6474e1b1de..08a16c9c33 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1097,6 +1097,12 @@ bool LLFace::canRenderAsMask() { return false; } + + LLMaterial* mat = te->getMaterialParams(); + if (mat && mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + { + return false; + } if ((te->getColor().mV[3] == 1.0f) && // can't treat as mask if we have face alpha (te->getGlow() == 0.f) && // glowing masks are hard to implement - don't mask |