summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-10 01:24:26 -0500
committerDave Parks <davep@lindenlab.com>2013-04-10 01:24:26 -0500
commit41097e74ecea7f99d2e4b0ee03dfa40ed6463f46 (patch)
treebc11638847269d2a2841c0db9ddaf37acb4cbabb
parentf86fd87437963a4e4eeffa58f4a7fb5ba30ce193 (diff)
NORSPEC-75 Fix bug introduced by previous change where objects with an emissive mask appear fullbright.
-rw-r--r--indra/newview/lldrawpoolsimple.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 1dbaad9c18..1a6293c010 100644
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -359,11 +359,6 @@ void LLDrawPoolFullbright::renderPostDeferred(S32 pass)
gGL.setSceneBlendType(LLRender::BT_ALPHA);
U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX;
pushBatches(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask, TRUE, TRUE);
-
- pushBatches(LLRenderPass::PASS_MATERIAL_ALPHA_EMISSIVE, fullbright_mask, TRUE, FALSE);
- pushBatches(LLRenderPass::PASS_SPECMAP_EMISSIVE, fullbright_mask, TRUE, FALSE);
- pushBatches(LLRenderPass::PASS_NORMMAP_EMISSIVE, fullbright_mask, TRUE, FALSE);
- pushBatches(LLRenderPass::PASS_NORMSPEC_EMISSIVE, fullbright_mask, TRUE, FALSE);
}
void LLDrawPoolFullbright::endPostDeferredPass(S32 pass)