diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-07 15:09:18 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-07 15:09:18 -0800 |
| commit | dcf7ed021b11b2ec990625389aa185081eeab915 (patch) | |
| tree | 32bc6bb63df7a0fad80c6026d7413e968ddcabe2 /indra/newview | |
| parent | 160a9532bad6d4d0112b888b3490d94ee34f5f13 (diff) | |
| parent | 41e095deb8f40de24c26ef10dda03951566e03c6 (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 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9068151435..9548263843 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4334,8 +4334,8 @@ void LLPipeline::renderDebug() gUIProgram.bind(); }
- gGL.setSceneBlendType(LLRender::BT_ALPHA);
- gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); gPipeline.disableLights(); //Render any navmesh geometry
@@ -4368,8 +4368,16 @@ void LLPipeline::renderDebug() }
//physics/exclusion shapes
if ( pathfindingConsole->isRenderAnyShapes() )
- {
- llPathingLibInstance->renderNavMeshShapesVBO( pathfindingConsole->getRenderShapeFlags() );
+ {
+ LLGLEnable blend(GL_BLEND);
+ glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
+ llPathingLibInstance->renderNavMeshShapesVBO( pathfindingConsole->getRenderShapeFlags() );
+ gGL.flush();
+ LLGLDisable blendOut(GL_BLEND);
+ glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
+ llPathingLibInstance->renderNavMeshShapesVBO( pathfindingConsole->getRenderShapeFlags() );
+ gGL.flush();
+ glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
}
//User designated path
if ( pathfindingConsole->isRenderPath() )
|