diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
| commit | 299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch) | |
| tree | 985a3fe37b693cf377c953a880c967f5e29b2abc /indra/newview/lldrawpoolalpha.cpp | |
| parent | 01ee25cca43b175567859becd1eacf77db24af55 (diff) | |
| parent | 93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff) | |
Automated merge with file:///Users/oz/Work/V-PR
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index ad7e3ad593..ddcf42e523 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -138,6 +138,7 @@ void LLDrawPoolAlpha::beginPostDeferredPass(S32 pass) gPipeline.mDeferredDepth.bindTarget(); simple_shader = NULL; fullbright_shader = NULL; + gObjectFullbrightProgram.bind(); } deferred_render = TRUE; @@ -156,6 +157,7 @@ void LLDrawPoolAlpha::endPostDeferredPass(S32 pass) { gPipeline.mDeferredDepth.flush(); gPipeline.mScreen.bindTarget(); + gObjectFullbrightProgram.unbind(); } deferred_render = FALSE; @@ -238,7 +240,7 @@ void LLDrawPoolAlpha::render(S32 pass) fullbright_shader->bind(); } pushBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); - LLGLSLShader::bindNoShader(); + //LLGLSLShader::bindNoShader(); } else { |