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

Reordered operations to make code easier to follow

Browse Source
This commit is contained in:
Robert Osfield
2017-03-09 18:16:04 +00:00
parent 91564e36b0
commit 445f2bfe21
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgText/Text3D.cpp
View File

@@ -475,7 +475,6 @@ void Text3D::drawImplementation(osg::RenderInfo& renderInfo) const
{
osg::State & state = *renderInfo.getState();
bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects);
// ** save the previous modelview matrix
osg::Matrix previous_modelview(state.getModelViewMatrix());
@@ -500,6 +499,7 @@ void Text3D::drawImplementation(osg::RenderInfo& renderInfo) const
}
osg::VertexArrayState* vas = state.getCurrentVertexArrayState();
bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects);
bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject);
bool requiresSetArrays = !usingVertexBufferObjects || !usingVertexArrayObjects || vas->getRequiresSetArrays();