From Farshid Lashkari, Added GLBeginEndAdapter::reset(), and _overallNormalAssigned, _overallColorAssigned flags to avoid the GLBeginEndAdapter adapter setting colour and normals when none has been assigned.

2012-09-20 11:18:19 +00:00
parent d511288718
commit 01c7d87b1a
3 changed files with 19 additions and 3 deletions
--- a/src/osg/ArrayDispatchers.cpp
+++ b/src/osg/ArrayDispatchers.cpp
@@ -578,7 +578,9 @@ void ArrayDispatchers::reset()
    if (!_initialized) init();

    _useVertexAttribAlias = false;
-    _useGLBeginEndAdapter = false;
+    
+    _useGLBeginEndAdapter = false;    
+    _glBeginEndAdapter->reset();

    for(ActiveDispatchList::iterator itr = _activeDispatchList.begin();
        itr != _activeDispatchList.end();