diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index aad2a8acb..7d65bd359 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -351,6 +351,7 @@ void LLDrawPoolAlpha::render(S32 pass) gHighlightProgram.unbind(); } } + gGL.setSceneBlendType(LLRender::BT_ALPHA); } void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index d24d4a033..0b99cac2c 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1639,6 +1639,7 @@ void LLDrawPoolAvatar::renderRiggedAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_ALPHA); + gGL.setSceneBlendType(LLRender::BT_ALPHA); gGL.setColorMask(true, false); } } @@ -1656,6 +1657,7 @@ void LLDrawPoolAvatar::renderRiggedFullbrightAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA); + gGL.setSceneBlendType(LLRender::BT_ALPHA); gGL.setColorMask(true, false); } } diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index dc48a4e29..8465d34a7 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -215,10 +215,12 @@ void LLDrawPoolTerrain::render(S32 pass) else if (gGLManager.mNumTextureUnits < 4) { renderFull2TU(); + gGL.setSceneBlendType(LLRender::BT_ALPHA); } else { renderFull4TU(); + gGL.setSceneBlendType(LLRender::BT_ALPHA); } } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b893f6ec2..c79b20a19 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7892,6 +7892,7 @@ void LLPipeline::renderDeferredLighting() gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.popMatrix(); } + gGL.setSceneBlendType(LLRender::BT_ALPHA); } gGL.setColorMask(true, true);