diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-02 17:09:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-02 17:09:32 -0500 |
| commit | f1975f0fe9d09b0c9cffa94dad31de2c9f0d4849 (patch) | |
| tree | bd3f174ef7fb348ccc33a704ade98d0f9d5b5115 /indra/newview | |
| parent | dd06eb40213d8429b34b5ee90cdb682924e976dc (diff) | |
| parent | 6bb9c2720e42be43741e470fb5b347686e584b6b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview')
| -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 |