Add automatic parenting for scene objects spawned over the network

Source/Engine/Networking/NetworkReplicator.cpp

@@ -15,6 +15,8 @@
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Platform/CriticalSection.h"
 #include "Engine/Engine/EngineService.h"
+#include "Engine/Level/Actor.h"
+#include "Engine/Level/SceneObject.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Scripting/Scripting.h"
 #include "Engine/Scripting/ScriptingObjectReference.h"
@@ -273,6 +275,14 @@ void NetworkReplicator::AddObject(ScriptingObject* obj, ScriptingObject* parent)
     if (Objects.Contains(obj))
         return;
 
+    // Automatic parenting for scene objects
+    if (!parent)
+    {
+        auto sceneObject = ScriptingObject::Cast<SceneObject>(obj);
+        if (sceneObject)
+            parent = sceneObject->GetParent();
+    }
+
     // Add object to the list
     NetworkReplicatedObject item;
     item.Object = obj;
@@ -726,6 +736,16 @@ void NetworkInternal::OnNetworkMessageObjectSpawn(NetworkEvent& event, NetworkCl
 #endif
         IdsRemappingTable.Add(msgData.ObjectId, item.ObjectId);
 
+        // Automatic parenting for scene objects
+        auto sceneObject = ScriptingObject::Cast<SceneObject>(obj);
+        if (sceneObject)
+        {
+            if (parent && parent->Object.Get() && parent->Object->Is<Actor>())
+                sceneObject->SetParent(parent->Object.As<Actor>());
+            else if (auto* parentActor = Scripting::FindObject<Actor>(msgData.ParentId))
+                sceneObject->SetParent(parentActor);
+        }
+
         // TODO: if  we're server then spawn this object further on other clients
     }
 }