From a1cee0f0bf570a38d9722d3255dd3250fab0f008 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 28 Jan 2021 00:38:08 +0100 Subject: [PATCH] Fix crash when applying changes to prefab --- Source/Engine/Level/Prefabs/Prefab.Apply.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Level/Prefabs/Prefab.Apply.cpp b/Source/Engine/Level/Prefabs/Prefab.Apply.cpp index 4305046e0..c0029aa93 100644 --- a/Source/Engine/Level/Prefabs/Prefab.Apply.cpp +++ b/Source/Engine/Level/Prefabs/Prefab.Apply.cpp @@ -850,7 +850,11 @@ bool Prefab::ApplyAllInternal(Actor* targetActor, bool linkTargetActorObjectToPr } // Keep root unlinked - root->_parent = nullptr; + if (root->_parent) + { + root->_parent->Children.Remove(root); + root->_parent = nullptr; + } } // Link objects hierarchy