From 97df15b2056a6b3831e7ebb33f771faa3e744b9d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 4 Aug 2016 17:51:45 +0100
Subject: [PATCH] Improved naming of createVertexArrayState(..) method

---
 include/osg/Drawable | 2 +-
 include/osg/Geometry | 2 +-
 src/osg/Drawable.cpp | 4 ++--
 src/osg/Geometry.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/osg/Drawable b/include/osg/Drawable
index bab190f04..63f51a3a3 100644
--- a/include/osg/Drawable
+++ b/include/osg/Drawable
@@ -276,7 +276,7 @@ class OSG_EXPORT Drawable : public Node
         */
         virtual void compileGLObjects(RenderInfo& renderInfo) const;
 
-        virtual VertexArrayState* setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
+        virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
 
 
         /** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/
diff --git a/include/osg/Geometry b/include/osg/Geometry
index fba5c187c..50d1dd48d 100644
--- a/include/osg/Geometry
+++ b/include/osg/Geometry
@@ -230,7 +230,7 @@ class OSG_EXPORT Geometry : public Drawable
 
         bool                            _containsDeprecatedData;
 
-        virtual VertexArrayState* setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
+        virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
 
     public:
 
diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp
index 8c9763603..3407978b1 100644
--- a/src/osg/Drawable.cpp
+++ b/src/osg/Drawable.cpp
@@ -641,7 +641,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
         VertexArrayState* vas = _vertexArrayStateList[contextID].get();
         if (!vas)
         {
-            _vertexArrayStateList[contextID] = vas = setUpVertexArrayState(renderInfo, true);
+            _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true);
         }
         else
         {
@@ -699,7 +699,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
     }
 }
 
-VertexArrayState* Drawable::setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
+VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
 {
     osg::State* state = renderInfo.getState();
     return new osg::VertexArrayState(state->get<GLExtensions>());
diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index dc8641910..1a66b78b4 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -663,7 +663,7 @@ void Geometry::releaseGLObjects(State* state) const
 
 }
 
-VertexArrayState* Geometry::setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
+VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
 {
     OSG_NOTICE<<"Creating new osg::VertexArrayState"<<std::endl;
     State& state = *renderInfo.getState();
@@ -764,7 +764,7 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const
         {
             VertexArrayState* vas = 0;
 
-            _vertexArrayStateList[contextID] = vas = setUpVertexArrayState(renderInfo, true);
+            _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true);
 
             State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);