diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 98e5a92bc..2ffbace3b 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -82,14 +82,17 @@ void MorphGeometry::accept(osg::NodeVisitor &nv)
 
     if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
         cull(&nv);
-    else if (nv.getVisitorType() == osg::NodeVisitor::INTERSECTION_VISITOR)
-        nv.apply(*getGeometry(mLastFrameNumber));
     else
         nv.apply(*this);
 
     nv.popFromNodePath();
 }
 
+void MorphGeometry::accept(osg::PrimitiveFunctor& func) const
+{
+    getGeometry(mLastFrameNumber)->accept(func);
+}
+
 osg::BoundingBox MorphGeometry::computeBoundingBox() const
 {
     bool anyMorphTarget = false;
diff --git a/components/sceneutil/morphgeometry.hpp b/components/sceneutil/morphgeometry.hpp
index 1afef1895..122c1456c 100644
--- a/components/sceneutil/morphgeometry.hpp
+++ b/components/sceneutil/morphgeometry.hpp
@@ -57,6 +57,8 @@ namespace SceneUtil
         osg::ref_ptr<osg::Geometry> getSourceGeometry() const;
 
         virtual void accept(osg::NodeVisitor &nv);
+        virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }
+        virtual void accept(osg::PrimitiveFunctor&) const;
 
         virtual osg::BoundingBox computeBoundingBox() const;
 
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index f52bca80c..7f148cf5e 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -318,14 +318,17 @@ void RigGeometry::accept(osg::NodeVisitor &nv)
         cull(&nv);
     else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
         updateBounds(&nv);
-    else if (nv.getVisitorType() == osg::NodeVisitor::INTERSECTION_VISITOR)
-        nv.apply(*getGeometry(mLastFrameNumber));
     else
         nv.apply(*this);
 
     nv.popFromNodePath();
 }
 
+void RigGeometry::accept(osg::PrimitiveFunctor& func) const
+{
+    getGeometry(mLastFrameNumber)->accept(func);
+}
+
 osg::Geometry* RigGeometry::getGeometry(unsigned int frame) const
 {
     return mGeometry[frame%2].get();
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 638f53679..64f4bf312 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -48,6 +48,8 @@ namespace SceneUtil
         osg::ref_ptr<osg::Geometry> getSourceGeometry();
 
         virtual void accept(osg::NodeVisitor &nv);
+        virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }
+        virtual void accept(osg::PrimitiveFunctor&) const;
 
     private:
         void cull(osg::NodeVisitor* nv);