From 9b6ef150ff17cdf4a253e838b0b59093fdf3f71c Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Fri, 25 Jun 2021 08:53:25 -0700 Subject: [PATCH] LYN-2480 | Minor fixes to the Prefab system (#1581) Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console). Also avoid marking templates dirty when they are added. --- .../AzToolsFramework/Prefab/PrefabSystemComponent.cpp | 1 - .../AzToolsFramework/Prefab/PrefabUndoCache.cpp | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp index c58379ea3e..9d1e95657d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp @@ -414,7 +414,6 @@ namespace AzToolsFramework } m_templateFilePathToIdMap.emplace(AZStd::make_pair(filePath, newTemplateId)); - newTemplate.MarkAsDirty(true); return newTemplateId; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp index bc48846585..dcf2a57c64 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp @@ -130,10 +130,7 @@ namespace AzToolsFramework if (!instanceOptionalReference.has_value()) { - AZ_Warning( - "Undo", false, - "PrefabUndoCache was told to update the cache for entity of id %p (%s), but that entity does not have an owning instance.", - entityId, entity->GetName().c_str()); + // This is not an error, we just don't handle this entity. return; }