Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -221,7 +221,7 @@ namespace CommandSystem
        // Resolve the filename if it starts with a path alias
        if (auto fileIoBase{ AZ::IO::FileIOBase::GetInstance() }; fileIoBase && filename.starts_with('@'))
        {
-            char resolvedPath[AZ::StringFunc::Path::MaxPathLength];
+            char resolvedPath[AZ::IO::MaxPathLength];
            if (fileIoBase->ResolvePath(filename.c_str(), resolvedPath, AZ_ARRAY_SIZE(resolvedPath)))
            {
                filename = resolvedPath;