diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
| commit | be210914f4e9081f021cc1ad3b671765aba79b61 (patch) | |
| tree | 006e4ec827b8c1b3cf6042c08e12aadf48f43943 /indra/newview/llface.cpp | |
| parent | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (diff) | |
| parent | d8f081cf1b18ddb5f0412b21f4d36bfce6abae19 (diff) | |
merge changes for DRTVWR-238
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | 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 188f943f13..605cb81c10 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1062,7 +1062,11 @@ bool LLFace::canRenderAsMask() } const LLTextureEntry* te = getTextureEntry(); - + if( !te || !getViewerObject() || !getTexture() ) + { + 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 getTexture()->getIsAlphaMask()) // texture actually qualifies for masking (lazily recalculated but expensive) |