diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-03 16:12:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-03 16:12:33 -0500 |
| commit | 68a4e0ee992fc6f2f1e3a733788f6fe31b85b549 (patch) | |
| tree | 3ede05f33562919aacf4c1940f0f00b02a11e68a /indra/newview | |
| parent | 2388de3f958f019255c1eb50cafb540e87a3ca3a (diff) | |
Fix build. Axe deprecated glNormal call. Don't show the world just because navmesh isn't checked.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c1b0e6736f..4c40c6f12e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4340,24 +4340,28 @@ void LLPipeline::renderDebug() if (!pathfindingConsoleHandle.isDead()) { LLFloaterPathfindingConsole *pathfindingConsole = pathfindingConsoleHandle.get(); + + if ( pathfindingConsole->isRenderWorld() ) + { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else + { + const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear; + gGL.setColorMask(true, true); + glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0); + glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + gGL.setColorMask(true, false); + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } + //NavMesh if ( pathfindingConsole->isRenderNavMesh() ) { gGL.flush(); glLineWidth(2.0f); LLGLEnable cull(GL_CULL_FACE); LLGLDisable blend(GL_BLEND); - if ( pathfindingConsole->isRenderWorld() ) - { - glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - } - else - { - const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear; - glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0); - glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - } - + int materialIndex = pathfindingConsole->getHeatMapType(); llPathingLibInstance->renderNavMesh( materialIndex ); gGL.flush(); |