Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user