From 761cee128df64ceb117c49e23bd5bffd53377d12 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 6 Sep 2021 11:48:49 +0000
Subject: [PATCH] make android adk happy

---
 components/sceneutil/attach.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index ba7fee2e06..0d0923b1c1 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -86,14 +86,14 @@ namespace SceneUtil
         std::string mFilter2;
     };
 
-    void mergeUserData(osg::UserDataContainer* source, osg::Object* target)
+    void mergeUserData(const osg::UserDataContainer* source, osg::Object* target)
     {
         if (!target->getUserDataContainer())
-            target->setUserDataContainer(source);
+            target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
         else
         {
             for (unsigned int i=0; i<source->getNumUserObjects(); ++i)
-                target->getUserDataContainer()->addUserObject(source->getUserObject(i));
+                target->getUserDataContainer()->addUserObject(osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
         }
     }
 
@@ -176,7 +176,7 @@ namespace SceneUtil
             else
             {
                 attachNode->addChild(clonedToAttach);
-                return toAttach;
+                return clonedToAttach;
             }
         }
     }