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
@@ -851,7 +851,9 @@ namespace ImageProcessingAtom

        if (preset == nullptr)
        {
-            AZ_Assert(false, "preset should always exist");
+            AZStd::string uuidStr;
+            textureSettings.m_preset.ToString(uuidStr);
+            AZ_Assert(false, "%s cannot find image preset with ID %s.", imageFilePath.c_str(), uuidStr.c_str());
            return nullptr;
        }