diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-07 14:40:29 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-07 14:40:29 -0800 |
| commit | 5467d79c7b1a04dfb6cd2151b983bccef87dfd58 (patch) | |
| tree | 6c1dfb12960d208621a45489eca96f054e4a1c2a /indra/newview | |
| parent | a7944f17bec66e7c0f066ab3b6196cc2233b1ca7 (diff) | |
| parent | ce4f86c35b45fdae3b6cdfa7440664fe2b3169a5 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 87e21c1f05..9068151435 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4328,10 +4328,16 @@ void LLPipeline::renderDebug() LLMemType mt(LLMemType::MTYPE_PIPELINE); assertInitialized(); + if (LLGLSLShader::sNoFixedFunction) { gUIProgram.bind(); }
+
+ gGL.setSceneBlendType(LLRender::BT_ALPHA);
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+ gPipeline.disableLights(); +
//Render any navmesh geometry
LLPathingLib *llPathingLibInstance = LLPathingLib::getInstance();
if ( llPathingLibInstance != NULL )
|