Merge pull request #756 from aws-lumberyard-dev/Atom/mriegger/15542

Fixing clone function in DecalTextureArrayFeatureProcessor
5 years ago · dc8971e80d
parent 0cfc7f10a9 c07c7d822e
commit dc8971e80d
1 changed files with 8 additions and 1 deletions
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
@ -134,7 +134,14 @@ namespace AZ
            {
                m_decalData.GetData(decal.GetIndex()) = m_decalData.GetData(sourceDecal.GetIndex());
                const auto materialAsset = GetMaterialUsedByDecal(sourceDecal);
-                m_materialToTextureArrayLookupTable.at(materialAsset).m_useCount++;
+                if (materialAsset.IsValid())
+                {
+                    m_materialToTextureArrayLookupTable.at(materialAsset).m_useCount++;
+                }
+                else
+                {
+                    AZ_Warning("DecalTextureArrayFeatureProcessor", false, "CloneDecal called on a decal with no material set.");
+                }
                m_deviceBufferNeedsUpdate = true;
            }
            return decal;