Added check against State::useVertexBufferObjects(..) so that Display Lists are only used when VBO is OFF.

2016-08-15 18:17:35 +01:00
parent 961bffcca4
commit 359b136b5e
4 changed files with 7 additions and 5 deletions
--- a/include/osg/Drawable
+++ b/include/osg/Drawable
@@ -532,7 +532,7 @@ inline void Drawable::draw(RenderInfo& renderInfo) const


 #ifdef OSG_GL_DISPLAYLISTS_AVAILABLE
-    if (_useDisplayList)
+    if (!state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects) && _useDisplayList)
    {
        // get the contextID (user defined ID of 0 upwards) for the
        // current OpenGL context.