Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -124,7 +124,7 @@ namespace AZ
                }

                AZ_Assert(materialAsset.GetPropertyValues().size() <= Limits::Material::PropertyCountMax,
-                    "Too man material properties. Max is %d.", Limits::Material::PropertyCountMax);
+                    "Too many material properties. Max is %d.", Limits::Material::PropertyCountMax);
            }

            // Clear all override flags because we just loaded properties from the asset