diff options
| author | angela <angela@lindenlab.com> | 2009-10-29 18:07:46 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-29 18:07:46 +0800 |
| commit | 53d48741b8b595665d3f9a7f717bd9f8fa3f7601 (patch) | |
| tree | 7abafe6164e10a5295514e69c8f26ad8bc40f62c /indra/newview/lltexlayer.cpp | |
| parent | 07749af3871420b9f4542e288da4372cdf2d2513 (diff) | |
| parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 17547cae39..5d9046ac90 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -804,8 +804,9 @@ void LLTexLayerSet::renderAlphaMaskTextures(S32 x, S32 y, S32 width, S32 height, gGL.setColorMask(false, true); gGL.setSceneBlendType(LLRender::BT_REPLACE); + // (Optionally) replace alpha with a single component image from a tga file. - if (!info->mStaticAlphaFileName.empty() && mMaskLayerList.empty()) + if (!info->mStaticAlphaFileName.empty()) { LLGLSNoAlphaTest gls_no_alpha_test; gGL.flush(); |