Merge pull request #5070 from aws-lumberyard-dev/Atom/guthadam/material_component_clear_default_material_fixes

Fix clearing material component default material not updating

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -1387,10 +1387,13 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
+                    if (!pixmap.isNull())
+                    {
                         GUI->SetBrowseButtonIcon(pixmap);
                     }
                 }
             }
+        }
         else if (attrib == AZ_CRC_CE("BrowseButtonEnabled"))
         {
             bool enabled = true;
@@ -1417,6 +1420,8 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("ThumbnailIcon"))
         {
+            GUI->SetCustomThumbnailEnabled(false);
+
             AZStd::string iconPath;
             if (attrValue->Read<AZStd::string>(iconPath) && !iconPath.empty())
             {
@@ -1434,11 +1439,14 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
+                    if (!pixmap.isNull())
+                    {
                         GUI->SetCustomThumbnailEnabled(true);
                         GUI->SetCustomThumbnailPixmap(pixmap);
                     }
                 }
             }
+        }
         else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
         {
             PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast<PropertyAssetCtrl::EditCallbackType*>(attrValue->GetAttribute());

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp

@@ -66,17 +66,10 @@ namespace AzToolsFramework
     }
 
     void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName)
-    {
-        if (m_customThumbnailEnabled)
-        {
-            ClearThumbnail();
-        }
-        else
     {
         m_key = key;
         m_thumbnail->SetThumbnailKey(m_key, contextName);
         m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
-        }
         UpdateVisibility();
     }
 

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp

@@ -121,8 +121,13 @@ namespace AZ
             MaterialComponentRequestBus::Handler::BusDisconnect();
             MaterialReceiverNotificationBus::Handler::BusDisconnect();
             TickBus::Handler::BusDisconnect();
+
             ReleaseMaterials();
 
+            // Sending notification to wipe any previously assigned material overrides
+            MaterialComponentNotificationBus::Event(
+                m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, MaterialAssignmentMap());
+
             m_queuedMaterialUpdateNotification = false;
             m_entityId = AZ::EntityId(AZ::EntityId::InvalidEntityId);
         }
@@ -221,6 +226,11 @@ namespace AZ
             if (!anyQueued)
             {
                 ReleaseMaterials();
+
+                // If no other materials were loaded, the notification must still be sent in case there are externally managed material
+                // instances in the configuration
+                MaterialComponentNotificationBus::Event(
+                    m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, m_configuration.m_materials);
             }
         }
 
@@ -268,8 +278,6 @@ namespace AZ
             {
                 materialPair.second.Release();
             }
-
-            MaterialComponentNotificationBus::Event(m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, m_configuration.m_materials);
         }
 
         MaterialAssignmentMap MaterialComponentController::GetOriginalMaterialAssignments() const