diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 10:50:01 -0700 | 
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 10:50:01 -0700 | 
| commit | 3a4d72f8d993656a566847f1bb3cc9ad8ab9b398 (patch) | |
| tree | 6c8279effaf7ea3139c758415fa56b862d265727 /indra | |
| parent | 3541b4c61330fc79771b77409e3d77bd2b57fe06 (diff) | |
| parent | 9bcae4a4e6182583e30756b2ae4955d33265399f (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lldrawpoolsimple.cpp | 2 | 
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(); | 
