diff --git a/include/osg/State b/include/osg/State index 97b6fec2a..0dd5eb25b 100644 --- a/include/osg/State +++ b/include/osg/State @@ -528,7 +528,7 @@ class OSG_EXPORT State : public Referenced struct SetCurrentVertexArrayStateProxy { SetCurrentVertexArrayStateProxy(osg::State& state, VertexArrayState* vas):_state(state) { _state.setCurrentVertexArrayState(vas); } - ~SetCurrentVertexArrayStateProxy() { _state.setCurrentToGloabalVertexArrayState(); } + ~SetCurrentVertexArrayStateProxy() { _state.setCurrentToGlobalVertexArrayState(); } osg::State& _state; }; @@ -538,8 +538,8 @@ class OSG_EXPORT State : public Referenced /** Get the CurrentVetexArrayState object that take which vertex arrays are bound.*/ VertexArrayState* getCurrentVertexArrayState() const { return _vas; } - /** Set the getCurrentVertexArrayState to the GloabalVertexArrayState.*/ - void setCurrentToGloabalVertexArrayState() { _vas = _globalVertexArrayState.get(); } + /** Set the getCurrentVertexArrayState to the GlobalVertexArrayState.*/ + void setCurrentToGlobalVertexArrayState() { _vas = _globalVertexArrayState.get(); } /** disable the vertex, normal, color, tex coords, secondary color, fog coord and index arrays.*/ diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 031f34872..794166482 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -211,7 +211,7 @@ void State::initializeExtensionProcs() _globalVertexArrayState->assignAllDispatchers(); // if (_useVertexArrayObject) _globalVertexArrayState->generateVertexArrayObject(); - setCurrentToGloabalVertexArrayState(); + setCurrentToGlobalVertexArrayState(); setGLExtensionFuncPtr(_glClientActiveTexture,"glClientActiveTexture","glClientActiveTextureARB");