diff options
| author | prep <prep@lindenlab.com> | 2012-01-05 17:43:36 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-05 17:43:36 -0500 |
| commit | 1e45d1ae4c25ae8ec73d2b4dc40a5d4efb23121c (patch) | |
| tree | 26be40926360c0b9b093fc0cddf38636402f64ed | |
| parent | e31a0a7f0843266fe8a803dea954cae70e5d7506 (diff) | |
vbos for physics shapes are rendering correctly
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 0965f00e0b..ac8d45789c 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -85,20 +85,18 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L //=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
+ LLGLSUIDefault gls_ui;
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false;
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
- LLGLEnable cull( GL_CULL_FACE );
- + LLGLEnable cull( GL_CULL_FACE ); //pass 1 filled
pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
- //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
- //static GLubyte red[]= { 255.0f, 0.0f, 0.0f, 255.0f };
- //glColor4ubv( red );
+ glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
//pass 2 outlined
- //pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
+ pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
|