From 47e87cc2bd9de1dfd31ac06e4dae4656ea9df31f Mon Sep 17 00:00:00 2001 From: elsid Date: Thu, 7 Mar 2019 23:49:20 +0300 Subject: [PATCH] Fix ODR violation for VDSMCameraCullCallback This class is also defined in OpenSceneGraph at global namespace. --- components/sceneutil/mwshadowtechnique.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp index 64c2e6e55f..4125ebe7d1 100644 --- a/components/sceneutil/mwshadowtechnique.cpp +++ b/components/sceneutil/mwshadowtechnique.cpp @@ -25,6 +25,8 @@ #include +namespace { + using namespace osgShadow; using namespace SceneUtil; @@ -331,6 +333,8 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv) _projectionMatrix = cv->getProjectionMatrix(); } +} // namespace + MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds(osg::Viewport* viewport, const osg::Matrixd& projectionMatrix, osg::Matrixd& viewMatrix) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN) {