From b92a68f5a43d09ee1446b1277231adf4c7cb346d Mon Sep 17 00:00:00 2001 From: srikappa Date: Thu, 13 May 2021 14:45:06 -0700 Subject: [PATCH] Improved a comment --- .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp | 3 ++- .../AzToolsFramework/Prefab/PrefabPublicInterface.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index eec0128419..bbc964d9a4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -642,7 +642,8 @@ namespace AzToolsFramework AZ::EntityId firstEntityIdToDelete = entityIds[0]; InstanceOptionalReference commonOwningInstance = GetOwnerInstanceByEntityId(firstEntityIdToDelete); - // If the first entity id is that of an instance, we need to delete that instance from it's parent. + // If the first entity id is a container entity id, then we need to mark its parent as the common owning instance because you + // cannot detete an instance from itself. if (commonOwningInstance->get().GetContainerEntityId() == firstEntityIdToDelete && !IsLevelInstanceContainerEntity(firstEntityIdToDelete)) { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h index 1abd183ce8..72bc5df3f6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h @@ -28,9 +28,9 @@ namespace AzToolsFramework namespace Prefab { - using PrefabOperationResult = AZ::Outcome; - using PrefabRequestResult = AZ::Outcome; - using PrefabEntityResult = AZ::Outcome; + typedef AZ::Outcome PrefabOperationResult; + typedef AZ::Outcome PrefabOperationResult; + typedef AZ::Outcome PrefabEntityResult; /*! * PrefabPublicInterface