diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-09 20:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-09 20:57:23 +0000 |
| commit | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (patch) | |
| tree | b40ca6762c7546b65db3966c04ef545a23643f21 /indra/llrender/llvertexbuffer.cpp | |
| parent | dbe0176552e070baef9a693252cb47dda97d1fb4 (diff) | |
QAR-537 Viewer 1.20 RC 6
merge -r 86279:86925 Branch_1-20-Viewer -> release
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 5a1079ac15..2f053a6493 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -232,7 +232,7 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const llerrs << "Bad vertex buffer draw range: [" << first << ", " << first+count << "]" << llendl; } - if (mGLBuffer != sGLRenderBuffer) + if (mGLBuffer != sGLRenderBuffer || useVBOs() != sVBOActive) { llerrs << "Wrong vertex buffer bound." << llendl; } |