From af08cc5ab319c7275d367f6af9305d3107276099 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Tue, 9 Nov 2021 10:05:33 +0000
Subject: [PATCH 1/2] Various bug fixes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
---
 .../TerrainSurfaceMaterialsListComponent.cpp        | 13 +++++++++----
 .../TerrainSurfaceMaterialsListComponent.h          |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
index 271919070c..7da6130f7b 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
@@ -74,7 +74,7 @@ namespace Terrain
 
                     ->DataElement(
                         AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialsListConfig::m_surfaceMaterials,
-                        "Gradient to Material Mappings", "Maps surfaces to materials.");
+                        "Material Mappings", "Maps surfaces to materials.");
             }
         }
     }
@@ -112,6 +112,11 @@ namespace Terrain
     {
     }
 
+    TerrainSurfaceMaterialsListComponent ::~TerrainSurfaceMaterialsListComponent()
+    {
+        Deactivate();
+    }
+
     void TerrainSurfaceMaterialsListComponent::Activate()
     {
         m_cachedAabb = AZ::Aabb::CreateNull();
@@ -123,7 +128,7 @@ namespace Terrain
             {
                 surfaceMaterialMapping.m_active = false;
                 surfaceMaterialMapping.m_materialAsset.QueueLoad();
-                AZ::Data::AssetBus::Handler::BusConnect(surfaceMaterialMapping.m_materialAsset.GetId());
+                AZ::Data::AssetBus::MultiHandler::BusConnect(surfaceMaterialMapping.m_materialAsset.GetId());
             }
         }
     }
@@ -136,7 +141,7 @@ namespace Terrain
         {
             if (surfaceMaterialMapping.m_materialAsset.GetId().IsValid())
             {
-                AZ::Data::AssetBus::Handler::BusDisconnect(surfaceMaterialMapping.m_materialAsset.GetId());
+                AZ::Data::AssetBus::MultiHandler::BusDisconnect(surfaceMaterialMapping.m_materialAsset.GetId());
                 surfaceMaterialMapping.m_materialAsset.Release();
                 surfaceMaterialMapping.m_materialInstance.reset();
                 surfaceMaterialMapping.m_activeMaterialAssetId = AZ::Data::AssetId();
@@ -202,7 +207,7 @@ namespace Terrain
                 // Don't disconnect from the AssetBus if this material is mapped more than once.
                 if (CountMaterialIDInstances(surfaceMaterialMapping.m_activeMaterialAssetId) == 1)
                 {
-                    AZ::Data::AssetBus::Handler::BusDisconnect(surfaceMaterialMapping.m_activeMaterialAssetId);
+                    AZ::Data::AssetBus::MultiHandler::BusDisconnect(surfaceMaterialMapping.m_activeMaterialAssetId);
                 }
 
                 surfaceMaterialMapping.m_activeMaterialAssetId = AZ::Data::AssetId();
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
index 7c36033c41..a6650bf035 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
@@ -53,7 +53,7 @@ namespace Terrain
     class TerrainSurfaceMaterialsListComponent
         : public AZ::Component
         , private TerrainAreaMaterialRequestBus::Handler
-        , private AZ::Data::AssetBus::Handler
+        , private AZ::Data::AssetBus::MultiHandler
         , private LmbrCentral::ShapeComponentNotificationsBus::Handler
     {
     public:
@@ -67,7 +67,7 @@ namespace Terrain
 
         TerrainSurfaceMaterialsListComponent(const TerrainSurfaceMaterialsListConfig& configuration);
         TerrainSurfaceMaterialsListComponent() = default;
-        ~TerrainSurfaceMaterialsListComponent() = default;
+        ~TerrainSurfaceMaterialsListComponent();
 
         //////////////////////////////////////////////////////////////////////////
         // AZ::Component interface implementation

From bff8a2e147f66403b19f9658d556c5be9c6aaedc Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:00:26 +0000
Subject: [PATCH 2/2] improved fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
---
 .../Components/TerrainSurfaceMaterialsListComponent.cpp    | 7 +------
 .../Components/TerrainSurfaceMaterialsListComponent.h      | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
index 7da6130f7b..1dbcbd1120 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
@@ -112,11 +112,6 @@ namespace Terrain
     {
     }
 
-    TerrainSurfaceMaterialsListComponent ::~TerrainSurfaceMaterialsListComponent()
-    {
-        Deactivate();
-    }
-
     void TerrainSurfaceMaterialsListComponent::Activate()
     {
         m_cachedAabb = AZ::Aabb::CreateNull();
@@ -243,7 +238,7 @@ namespace Terrain
             // All materials have been deactivated, stop listening for requests and notifications.
             m_cachedAabb = AZ::Aabb::CreateNull();
             LmbrCentral::ShapeComponentNotificationsBus::Handler::BusDisconnect();
-            TerrainAreaMaterialRequestBus::Handler::BusConnect(GetEntityId());
+            TerrainAreaMaterialRequestBus::Handler::BusDisconnect();
         }
     }
 
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
index a6650bf035..72eee5f68e 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
@@ -67,7 +67,7 @@ namespace Terrain
 
         TerrainSurfaceMaterialsListComponent(const TerrainSurfaceMaterialsListConfig& configuration);
         TerrainSurfaceMaterialsListComponent() = default;
-        ~TerrainSurfaceMaterialsListComponent();
+        ~TerrainSurfaceMaterialsListComponent() = default;
 
         //////////////////////////////////////////////////////////////////////////
         // AZ::Component interface implementation