From f4134316677a449e50d26cca5459bd09ea1c898c Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 21 Mar 2021 13:27:45 +0100 Subject: [PATCH] Add error check to prevent changing parent of the Scene actor --- Source/Engine/Level/Actor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Engine/Level/Actor.cpp b/Source/Engine/Level/Actor.cpp index fa5bce1ff..8ab195ef1 100644 --- a/Source/Engine/Level/Actor.cpp +++ b/Source/Engine/Level/Actor.cpp @@ -203,6 +203,13 @@ void Actor::SetParent(Actor* value, bool worldPositionsStays, bool canBreakPrefa LOG(Error, "Editing scene hierarchy is only allowed on a main thread."); return; } +#if USE_EDITOR || !BUILD_RELEASE + if (Is()) + { + LOG(Error, "Cannot change parent of the Scene. Use Level to manage scenes."); + return; + } +#endif // Peek the previous state const Transform prevTransform = _transform;