diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
commit | c3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch) | |
tree | f0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/newview/lldrawpoolsimple.cpp | |
parent | b89c31052802450ec59fee48ace4c66a713755ab (diff) | |
parent | aad87303c88458c9db3c312d44e8a4b125de1fe3 (diff) |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/lldrawpoolsimple.cpp')
-rw-r--r-- | indra/newview/lldrawpoolsimple.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index ca7a1b47c2..c8e6f95ab6 100644 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -55,6 +55,10 @@ void LLDrawPoolGlow::render(S32 pass) LLFastTimer t(FTM_RENDER_GLOW); LLGLEnable blend(GL_BLEND); LLGLDisable test(GL_ALPHA_TEST); + gGL.flush(); + /// Get rid of z-fighting with non-glow pass. + LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL); + glPolygonOffset(-1.0f, -1.0f); gGL.setSceneBlendType(LLRender::BT_ADD); U32 shader_level = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT); |