Don't create an unnecessary osg::Group when copying over a rig

9 years ago · 1e5b4bea0a
parent 36bb255bc0
commit 1e5b4bea0a
1 changed files with 12 additions and 3 deletions
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@ -56,9 +56,18 @@ namespace SceneUtil
            CopyRigVisitor copyVisitor(handle, filter);
            toAttach->accept(copyVisitor);

-            master->asGroup()->addChild(handle);
-
-            return handle;
+            if (handle->getNumChildren() == 1)
+            {
+                osg::ref_ptr<osg::Node> newHandle = handle->getChild(0);
+                handle->removeChild(newHandle);
+                master->asGroup()->addChild(newHandle);
+                return newHandle;
+            }
+            else
+            {
+                master->asGroup()->addChild(handle);
+                return handle;
+            }
        }
        else
        {