Fix order of new objects in Prefab after apply

#357
2021-03-18 09:20:47 +01:00
parent 42366ee66a
commit a21f6d1b9f
2 changed files with 30 additions and 3 deletions
--- a/Source/Engine/Level/SceneObjectsFactory.cpp
+++ b/Source/Engine/Level/SceneObjectsFactory.cpp
@@ -326,6 +326,15 @@ void SceneObjectsFactory::SynchronizePrefabInstances(Array<SceneObject*>& sceneO
    for (int32 i = objectsToCheckCount; i < sceneObjects.Count(); i++)
    {
        SceneObject* obj = sceneObjects[i];
+
+        // Preserve order in parent (values from prefab are used)
+        auto prefab = Content::LoadAsync<Prefab>(obj->GetPrefabID());
+        const auto defaultInstance = prefab && prefab->IsLoaded() ? prefab->GetDefaultInstance(obj->GetPrefabObjectID()) : nullptr;
+        if (defaultInstance)
+        {
+            obj->SetOrderInParent(defaultInstance->GetOrderInParent());
+        }
+
        obj->PostLoad();
    }