diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
| commit | f9b13d8f8510b1f7f02fcf92685471461b79858e (patch) | |
| tree | 72e3469605fb33aedc211649778c22ada2719d5c /indra/llrender/llvertexbuffer.cpp | |
| parent | c2da9f5d2cc86af0af34199c53e872fbff22637b (diff) | |
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 48c20b09a8..514ca25aa0 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1318,7 +1318,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { if (mGLBuffer) { - if (useVBOs() && sVBOActive) + if (sVBOActive) { glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); sBindCount++; @@ -1330,7 +1330,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) setup = TRUE; // ... or a client memory pointer changed } } - if (useVBOs() && mGLIndices && sIBOActive) + if (mGLIndices && sIBOActive) { /*if (sMapped) { |