diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-13 12:44:45 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-13 12:44:45 +0100 |
| commit | d3418e5e65f7845f89b5ce2019bd635861573ed3 (patch) | |
| tree | d56a1e629858cb89775c84c2a34b2282d29b2955 /indra/llrender/llvertexbuffer.cpp | |
| parent | 818e970b3efe65f6e471d071ae5f01603f61da79 (diff) | |
| parent | d50a34e6e37c34fb84ad232aad7b3bf2a3b3b408 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 4e94138746..ae43915a9d 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -819,7 +819,7 @@ BOOL LLVertexBuffer::useVBOs() const return FALSE; } #endif - return TRUE; + return sEnableVBOs; } //---------------------------------------------------------------------------- @@ -1183,7 +1183,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { if (mGLBuffer) { - if (useVBOs() && sVBOActive) + if (sEnableVBOs && sVBOActive) { glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); sBindCount++; @@ -1195,7 +1195,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) setup = TRUE; // ... or a client memory pointer changed } } - if (useVBOs() && mGLIndices && sIBOActive) + if (sEnableVBOs && mGLIndices && sIBOActive) { /*if (sMapped) { |