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

Fixed member variable names to avoid conflicts with osg::Node

Browse Source
This commit is contained in:
Robert Osfield
2018-03-23 19:54:01 +00:00
parent 9634688559
commit 1d5ae1362a
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/Drawable.cpp
View File

@@ -240,8 +240,8 @@ Drawable::Drawable()
Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
Node(drawable,copyop),
_initialBound(drawable._initialBound),
_computeBoundCallback(drawable._computeBoundCallback),
_initialBoundingBox(drawable._initialBoundingBox),
_computeBoundingBoxCallback(drawable._computeBoundingBoxCallback),
_boundingBox(drawable._boundingBox),
_shape(copyop(drawable._shape.get())),
_supportsDisplayList(drawable._supportsDisplayList),
@@ -252,7 +252,6 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
_drawCallback(drawable._drawCallback),
_createVertexArrayStateCallback(drawable._createVertexArrayStateCallback)
{
setStateSet(copyop(drawable._stateset.get()));
}
Drawable::~Drawable()