From 053e273b97bcacb191886afcad15c917addfa45c Mon Sep 17 00:00:00 2001
From: srikappa <srikappa@amazon.com>
Date: Wed, 26 May 2021 18:24:49 -0700
Subject: [PATCH] Clear dirty entities at the end of InstantiatePrefab logic

---
 .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index d3553c78e1..1b98711352 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -384,7 +384,10 @@ namespace AzToolsFramework
                 CreateLink(instanceToCreate->get(), instanceToParentUnder->get().GetTemplateId(), undoBatch.GetUndoBatch(), AZStd::move(patch));
 
                 // Update the cache - this prevents these changes from being stored in the regular undo/redo nodes
-                m_prefabUndoCache.Store(containerEntityId, AZStd::move(containerEntityDomAfter));
+                //m_prefabUndoCache.Store(containerEntityId, AZStd::move(containerEntityDomAfter));
+
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
             }
 
             return AZ::Success();