diff options
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9094984dfe..5f6e3f4675 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3618,6 +3618,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) }
LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
+ //Render navmesh geometry
{
if ( LLPathingLib::getInstance() )
{
@@ -3628,7 +3629,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) glClearColor(0.0f, 0.0f, 0.0f, 0.5f); // Black Background
glClearDepth(1.0f); // Depth Buffer Setup
glEnable(GL_DEPTH_TEST); // Enables Depth Testing
- glDepthFunc(GL_LEQUAL); // The Type Of Depth Testing To Do
+ glDepthFunc(GL_LEQUAL);
GLfloat LightAmbient[]= { 0.5f, 0.5f, 0.5f, 1.0f };
glLightfv(GL_LIGHT1, GL_AMBIENT, LightAmbient);
@@ -3647,6 +3648,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) if ( exclusiveDraw ) { return; }
}
}
+
// Initialize lots of GL state to "safe" values
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
@@ -3672,7 +3674,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sDefaultImagep);
LLViewerFetchedTexture::sDefaultImagep->setAddressMode(LLTexUnit::TAM_WRAP);
-
+
//////////////////////////////////////////////
//
// Actually render all of the geometry
|