From 853418db9493a3c3a68277aadaa49f0f078a3e3b Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 3 Feb 2017 17:42:21 +0100 Subject: [PATCH] Remove redundant handling of Geode in DisplayRequirementsVisitor --- include/osgUtil/DisplayRequirementsVisitor | 2 -- src/osgUtil/DisplayRequirementsVisitor.cpp | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/include/osgUtil/DisplayRequirementsVisitor b/include/osgUtil/DisplayRequirementsVisitor index f29d277d7..0c397f931 100644 --- a/include/osgUtil/DisplayRequirementsVisitor +++ b/include/osgUtil/DisplayRequirementsVisitor @@ -48,8 +48,6 @@ class OSGUTIL_EXPORT DisplayRequirementsVisitor : public osg::NodeVisitor virtual void apply(osg::Node& node); - virtual void apply(osg::Geode& geode); - protected: osg::ref_ptr _ds; diff --git a/src/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgUtil/DisplayRequirementsVisitor.cpp index 2d6dfc094..44e9b73e1 100644 --- a/src/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgUtil/DisplayRequirementsVisitor.cpp @@ -71,15 +71,3 @@ void DisplayRequirementsVisitor::apply(Node& node) traverse(node); } - -void DisplayRequirementsVisitor::apply(Geode& geode) -{ - osg::StateSet* geode_stateset = geode.getStateSet(); - if (geode_stateset) applyStateSet(*geode_stateset); - - for(unsigned int i = 0; i < geode.getNumDrawables(); i++ ) - { - osg::StateSet* stateset = geode.getDrawable(i)->getStateSet(); - if (stateset) applyStateSet(*stateset); - } -}