Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix

Fixed IMGUI Entity Outliner to show net entities
2021-11-15 14:23:10 +00:00
parent 38a03817bb 3fb97b1334
commit f9824fc4ee
2 changed files with 20 additions and 2 deletions
@@ -534,7 +534,7 @@ namespace AzFramework

    void TransformComponent::SetParentImpl(AZ::EntityId parentId, bool isKeepWorldTM)
    {
-        if (parentId == GetEntityId())
+        if (GetEntity() && parentId == GetEntityId())
        {
            AZ_Warning("TransformComponent", false, "An entity can not be set as its own parent.");
            return;