diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-05 13:59:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-05 13:59:32 -0500 |
| commit | de374744294d5d23e1b84a8feb8fa8b5e4e7dc49 (patch) | |
| tree | 7c8f16a2ded051142c707981c0db92ef7aa5ca09 | |
| parent | d50093cb4288642b9e715dd197d3c500cd6c811e (diff) | |
SH-1918 Fix for highlight transparent not working when basic shaders enabled.
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 8d46133912..18b67a4bc4 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -295,16 +295,24 @@ void LLDrawPoolAlpha::render(S32 pass) if (sShowDebugAlpha) { - if(gPipeline.canUseWindLightShaders()) + BOOL shaders = gPipeline.canUseVertexShaders(); + if(shaders) { - LLGLSLShader::bindNoShader(); + gObjectFullbrightNonIndexedProgram.bind(); + } + else + { + gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); } - gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); glColor4f(1,0,0,1); LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f); gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ; renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0); + if(shaders) + { + gObjectFullbrightNonIndexedProgram.unbind(); + } } } |