diff options
| author | prep <prep@lindenlab.com> | 2012-03-07 17:48:17 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-03-07 17:48:17 -0500 |
| commit | 41e095deb8f40de24c26ef10dda03951566e03c6 (patch) | |
| tree | 491fb928353f0274541c3a5366e262d04d1154b2 /indra/newview/pipeline.cpp | |
| parent | ce4f86c35b45fdae3b6cdfa7440664fe2b3169a5 (diff) | |
Path-287: VB bug fixes. Cleaned up rendering prims. Navmesh shape rendering fixes. Code cleanup
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -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() )
|