From 3fc86342061bab0c30bed6821f66933fef546930 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 29 Aug 2017 12:55:42 +0000
Subject: [PATCH] Check for a Geometry node when attaching bodyparts (Fixes
 #3957)

---
 components/nifosg/nifloader.cpp |  3 +++
 components/sceneutil/attach.cpp | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 78186c439..b7d1c15b8 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1130,6 +1130,8 @@ namespace NifOsg
                 triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
             }
 
+            geometry->setName(triShape->name);
+
             if (geometry->getDataVariance() == osg::Object::DYNAMIC)
             {
                 // Add a copy, we will alternate between the two copies every other frame using the FrameSwitch
@@ -1219,6 +1221,7 @@ namespace NifOsg
 
             osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
             rig->setSourceGeometry(geometry);
+            rig->setName(triShape->name);
 
             const Nif::NiSkinInstance *skin = triShape->skin.getPtr();
 
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 1385f771e..8634a4df6 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -32,29 +32,29 @@ namespace SceneUtil
 
         virtual void apply(osg::MatrixTransform& node)
         {
-            applyNode(node);
-        }
-        virtual void apply(osg::Geometry& node)
-        {
-            applyNode(node);
+            traverse(node);
         }
         virtual void apply(osg::Node& node)
         {
-            applyNode(node);
+            traverse(node);
         }
         virtual void apply(osg::Group& node)
         {
-            applyNode(node);
+            traverse(node);
         }
 
-        void applyNode(osg::Node& node)
+        virtual void apply(osg::Geometry& geom)
         {
-            std::string lowerName = Misc::StringUtils::lowerCase(node.getName());
+            std::string lowerName = Misc::StringUtils::lowerCase(geom.getName());
             if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
                     || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
-                mToCopy.push_back(&node);
-            else
-                traverse(node);
+            {
+                osg::Node* node = &geom;
+                while (node && node->getNumParents() && !node->getStateSet())
+                    node = node->getParent(0);
+                if (node)
+                    mToCopy.push_back(node);
+            }
         }
 
         void doCopy()