From 783e05058c5d74984ab554fdc60aa06839b9b5c9 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 9 May 2008 20:57:23 +0000 Subject: QAR-537 Viewer 1.20 RC 6 merge -r 86279:86925 Branch_1-20-Viewer -> release --- indra/llrender/llvertexbuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llrender/llvertexbuffer.cpp') 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; } -- cgit v1.3