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
@@ -75,6 +75,7 @@ namespace AZ::IO
        bool ResolvePath(const char* path, char* resolvedPath, AZ::u64 resolvedPathSize) const override;
        bool ResolvePath(AZ::IO::FixedMaxPath& resolvedPath, const AZ::IO::PathView& path) const override;
        using FileIOBase::ResolvePath;
+        bool ReplaceAlias(AZ::IO::FixedMaxPath& replacedAliasPath, const AZ::IO::PathView& path) const override;
        bool GetFilename(IO::HandleType fileHandle, char* filename, AZ::u64 filenameSize) const override;
        ////////////////////////////////////////////////////////////////////////////////////////////