FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed typo

Browse Source
This commit is contained in:
Robert Osfield 2017-12-31 13:17:23 +00:00
parent 94a1a84a59
commit dd1f95d24d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/State
View File

@ -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.*/

2
src/osg/State.cpp
View File

@ -211,7 +211,7 @@ void State::initializeExtensionProcs()
_globalVertexArrayState->assignAllDispatchers();
// if (_useVertexArrayObject) _globalVertexArrayState->generateVertexArrayObject();
setCurrentToGloabalVertexArrayState();
setCurrentToGlobalVertexArrayState();
setGLExtensionFuncPtr(_glClientActiveTexture,"glClientActiveTexture","glClientActiveTextureARB");