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

2016-09-02 18:26:11 +01:00
parent c19b271586 628f8fd9dc
commit 79ff8ba273
31 changed files with 89 additions and 43 deletions
--- a/src/osgVolume/Property.cpp
+++ b/src/osgVolume/Property.cpp
@@ -369,7 +369,11 @@ PropertyAdjustmentCallback::PropertyAdjustmentCallback():
 {
 }

-PropertyAdjustmentCallback::PropertyAdjustmentCallback(const PropertyAdjustmentCallback& pac,const osg::CopyOp&):
+PropertyAdjustmentCallback::PropertyAdjustmentCallback(const PropertyAdjustmentCallback& pac,const osg::CopyOp& copyop):
+    osg::Object(pac, copyop),
+    osg::Callback(pac, copyop),
+    osg::StateSet::Callback(pac, copyop),
+    osgGA::GUIEventHandler(pac, copyop), 
    _cyleForwardKey(pac._cyleForwardKey),
    _cyleBackwardKey(pac._cyleBackwardKey),
    _transparencyKey(pac._transparencyKey),