Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e

This commit is contained in:
Robert Osfield
2016-09-02 18:26:11 +01:00
31 changed files with 89 additions and 43 deletions

View File

@@ -30,8 +30,8 @@ CompositeViewer::CompositeViewer()
constructorInit();
}
CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& /*copyop*/):
osg::Object(true),
CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& copyop):
osg::Object(cv, copyop),
ViewerBase(cv)
{
constructorInit();

View File

@@ -177,7 +177,7 @@ View::View():
View::View(const osgViewer::View& view, const osg::CopyOp& copyop):
osg::Object(true),
osg::Object(view, copyop),
osg::View(view,copyop),
osgGA::GUIActionAdapter(),
_startTick(0),

View File

@@ -194,7 +194,7 @@ Viewer::Viewer(osg::ArgumentParser& arguments)
}
Viewer::Viewer(const osgViewer::Viewer& viewer, const osg::CopyOp& copyop):
osg::Object(true),
osg::Object(viewer, copyop),
ViewerBase(viewer),
View(viewer,copyop)
{