livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.

master
Dave Parks 2013-06-05 15:54:49 -05:00
parent 2c46363bfd
commit 9c7c1efe00
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lldrawpoolsimple.cpp
View File

@ -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();