Merged fix in svn/trunk that avoids the building of display lists when VBO's are compiled.

This commit is contained in:
Robert Osfield
2009-04-03 11:29:49 +00:00
parent 4ff8df73bc
commit 2bb480759f

View File

@@ -443,6 +443,17 @@ void Drawable::dirtyBound()
void Drawable::compileGLObjects(RenderInfo& renderInfo) const
{
bool useVertexArrays = _supportsVertexBufferObjects && _useVertexBufferObjects && renderInfo.getState()->isVertexBufferObjectSupported();
if (useVertexArrays)
{
if (_drawCallback.valid())
_drawCallback->drawImplementation(renderInfo,this);
else
drawImplementation(renderInfo);
return;
}
if (!_useDisplayList) return;
// get the contextID (user defined ID of 0 upwards) for the