Fixup merge

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-01 13:29:52 -07:00
parent db68911c9a
commit 76de21940d
1 changed files with 2 additions and 2 deletions
@@ -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;