From 76de21940ddd02eb08bee151b3b8b852e5b69abc Mon Sep 17 00:00:00 2001
From: mrieggeramzn <mriegger@amazon.com>
Date: Fri, 1 Oct 2021 13:29:52 -0700
Subject: [PATCH] Fixup merge

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
---
 .../Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
index 46b00ef47f..0323282f5c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
@@ -309,8 +309,8 @@ namespace AZ
             const bool isValidMaterialBeingUsedCurrently = m_decalData.GetData(decalIndex).m_textureArrayIndex != DecalData::UnusedIndex;
             if (isValidMaterialBeingUsedCurrently)
             {
-                AZ_Assert(
-                AZ_Assert(m_decalData.GetData(handle.GetIndex()).m_textureArrayIndex == DecalData::UnusedIndex, "Setting Material on a decal more than once is not currently supported.");
+                RemoveMaterialFromDecal(decalIndex);
+            }
 
             if (!material.IsValid())
                 return;