diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2011-12-14 15:58:39 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2011-12-14 15:58:39 -0800 |
| commit | e69f618e417d3d1d59c968863c43da8f7538ce68 (patch) | |
| tree | 692ce9f3eb2bd10f3136e0c295c3530ff706169a /indra/llrender | |
| parent | a9233d4f5c4a0f7b4225a7e6dbc02c024eea7cd9 (diff) | |
| parent | 7f8aebf78bddf0d15180700162da1728cb5a2bbf (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index c80ad3e180..3b217b426f 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -30,6 +30,7 @@ #include "llerror.h"
#include "llglheaders.h"
#include "llvertexbuffer.h"
+#include "llglslshader.h"
//=============================================================================
LLRenderNavPrim gRenderNav;
@@ -58,16 +59,16 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L LLColor4 colorA( color );
colorA*=1.5f;
gGL.color4fv( colorA.mV );
-
+ LLGLSLShader::sNoFixedFunction = false;
gGL.begin(LLRender::TRIANGLES);
{
gGL.vertex3fv( a.mV );
gGL.vertex3fv( b.mV );
gGL.vertex3fv( c.mV );
}
- gGL.end();
-
+ gGL.end();
gGL.flush();
+ LLGLSLShader::sNoFixedFunction = true;
}
//=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
@@ -75,7 +76,9 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) glLineWidth(1.5f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
LLGLDisable cull(GL_CULL_FACE);
+ LLGLSLShader::sNoFixedFunction = false;
pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
+ LLGLSLShader::sNoFixedFunction = true;
}
//=============================================================================
|