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/osg/ClusterCullingCallback.cpp
+++ b/src/osg/ClusterCullingCallback.cpp
@@ -29,7 +29,10 @@ ClusterCullingCallback::ClusterCullingCallback():
 }

 ClusterCullingCallback::ClusterCullingCallback(const ClusterCullingCallback& ccc,const CopyOp& copyop):
-    DrawableCullCallback(ccc,copyop),
+    Object(ccc, copyop),
+    Callback(ccc, copyop),
+    DrawableCullCallback(ccc, copyop),
+    NodeCallback(ccc, copyop),
    _controlPoint(ccc._controlPoint),
    _normal(ccc._normal),
    _radius(ccc._radius),