diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
| commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
| tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/newview/llface.cpp | |
| parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
| parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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) |