From 8f51c7689fac5b6dd7a252f6129bb57dd7c960aa Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Mon, 13 Dec 2021 17:31:45 +0100
Subject: [PATCH] Fix missing object linkage when loading missing prefab
 objects during scene load

---
 Source/Engine/Level/Prefabs/PrefabManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Level/Prefabs/PrefabManager.cpp b/Source/Engine/Level/Prefabs/PrefabManager.cpp
index 65f63439f..9d6e5b65c 100644
--- a/Source/Engine/Level/Prefabs/PrefabManager.cpp
+++ b/Source/Engine/Level/Prefabs/PrefabManager.cpp
@@ -138,6 +138,7 @@ Actor* PrefabManager::SpawnPrefab(Prefab* prefab, Actor* parent, Dictionary<Guid
     SceneObjectsFactory::Context context(modifier.Value);
 
     // Deserialize prefab objects
+    auto prevIdMapping = Scripting::ObjectsLookupIdMapping.Get();
     Scripting::ObjectsLookupIdMapping.Set(&modifier.Value->IdsMapping);
     for (int32 i = 0; i < objectsCount; i++)
     {
@@ -164,7 +165,7 @@ Actor* PrefabManager::SpawnPrefab(Prefab* prefab, Actor* parent, Dictionary<Guid
         if (obj)
             SceneObjectsFactory::Deserialize(context, obj, stream);
     }
-    Scripting::ObjectsLookupIdMapping.Set(nullptr);
+    Scripting::ObjectsLookupIdMapping.Set(prevIdMapping);
 
     // Assume that prefab has always only one root actor that is serialized first
     if (sceneObjects.Value->IsEmpty())