Merge branch 'main' into Atom/moudgils/FixTextureArray

2021-05-13 14:03:54 -07:00
parent 3a5ca1503a 7ecd1b1761
commit da8f5849aa
2135 changed files with 52031 additions and 196677 deletions
@@ -41,7 +41,11 @@ namespace AZ

        const RHI::ShaderResourceGroupLayout* ShaderResourceGroupAsset::GetLayout() const
        {
-            AZ_Assert(m_currentAPITypeIndex < m_perAPILayout.size(), "Invalid API Type index");
+            AZ_Error("RHI::ShaderResourceGroupLayout", m_currentAPITypeIndex < m_perAPILayout.size(), "Invalid API Type index");
+            if (m_currentAPITypeIndex >= m_perAPILayout.size())
+            {
+                return nullptr;
+            }
            return m_perAPILayout[m_currentAPITypeIndex].second.get();
        }