Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -20,6 +20,7 @@
#include <AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.h>
#include <AzToolsFramework/ToolsComponents/EditorInspectorComponent.h>
#include <AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h>
#include <AzToolsFramework/Undo/UndoCacheInterface.h>
#include "SliceMetadataEntityContextComponent.h"
@@ -196,10 +197,10 @@ namespace AzToolsFramework
SliceMetadataEntityContextNotificationBus::Broadcast(&SliceMetadataEntityContextNotifications::OnMetadataEntityAdded, metadataEntity.GetId());
// Register the metadata entity with the pre-emptive undo cache (if exists) so it has an initial state
auto* preemptiveUndoCache = PreemptiveUndoCache::Get();
if (preemptiveUndoCache)
auto undoCacheInterface = AZ::Interface<UndoSystem::UndoCacheInterface>::Get();
if (undoCacheInterface)
{
preemptiveUndoCache->UpdateCache(metadataEntity.GetId());
undoCacheInterface->UpdateCache(metadataEntity.GetId());
}
}