Merge remote-tracking branch 'origin' into MultiplayerComponents

2021-05-06 19:40:09 -07:00
parent b2b632aede cd0628f513
commit c21b4a577d
162 changed files with 15328 additions and 854 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;
        }