summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-05 15:54:49 -0500
committerDave Parks <davep@lindenlab.com>2013-06-05 15:54:49 -0500
commit9c7c1efe003fffed6fddc29608d3c0f07cd18c9c (patch)
tree4ffc9876b78000c96285f03b12a43e896fbbc887 /indra/newview
parent2c46363bfdd6653f492eec831f394ad1f6a52b0e (diff)
NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lldrawpoolsimple.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 3221369fa0..2cf9d833c6 100755
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -294,6 +294,7 @@ void LLDrawPoolAlphaMask::render(S32 pass)
}
else
{
+ LLGLEnable test(GL_ALPHA_TEST);
pushMaskBatches(LLRenderPass::PASS_ALPHA_MASK, getVertexDataMask(), TRUE, FALSE);
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); //OK
}
@@ -370,6 +371,7 @@ void LLDrawPoolFullbrightAlphaMask::render(S32 pass)
}
else
{
+ LLGLEnable test(GL_ALPHA_TEST);
gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
pushMaskBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, getVertexDataMask(), TRUE, FALSE);
gPipeline.enableLightsDynamic();