From 64186b4ec6819626476b0ab57a42904ed05dafa9 Mon Sep 17 00:00:00 2001
From: guthadam <guthadam@amazon.com>
Date: Tue, 29 Jun 2021 16:41:35 -0500
Subject: [PATCH] ATOM-15892 fixing material component clear overrides button

The clear material override properties button was not sending the notification to update the entity or undo state.

Signed-off-by: guthadam <guthadam@amazon.com>
---
 .../Code/Source/Material/EditorMaterialComponentSlot.cpp   | 7 ++++++-
 .../Code/Source/Material/EditorMaterialComponentSlot.h     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
index d5ea087dcc..669e576107 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
@@ -172,6 +172,11 @@ namespace AZ
         void EditorMaterialComponentSlot::Clear()
         {
             m_materialAsset = {};
+            ClearOverrides();
+        }
+
+        void EditorMaterialComponentSlot::ClearOverrides()
+        {
             m_propertyOverrides = {};
             m_matModUvOverrides = {};
             OnMaterialChanged();
@@ -284,7 +289,7 @@ namespace AZ
 
             menu.addSeparator();
 
-            action = menu.addAction("Clear Material Instance Overrides", [this]() { m_propertyOverrides = {}; m_matModUvOverrides = {}; });
+            action = menu.addAction("Clear Material Instance Overrides", [this]() { ClearOverrides(); });
             action->setEnabled(!m_propertyOverrides.empty() || !m_matModUvOverrides.empty());
 
             menu.exec(QCursor::pos());
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
index 1b62e94225..95d1fb6a27 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
@@ -35,6 +35,7 @@ namespace AZ
             void OpenMaterialEditor() const;
             void SetDefaultAsset();
             void Clear();
+            void ClearOverrides();
             void OpenMaterialExporter();
             void OpenMaterialInspector();
             void OpenUvNameMapInspector();