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
@@ -51,7 +51,7 @@ namespace AssetBundler
        // AzFramework::ApplicationRequests::Bus::Handler interface
        void NormalizePath(AZStd::string& /*path*/) override {}
        void NormalizePathKeepCase(AZStd::string& /*path*/) override {}
-        void CalculateBranchTokenForAppRoot(AZStd::string& /*token*/) const override {}
+        void CalculateBranchTokenForEngineRoot(AZStd::string& /*token*/) const override {}

        const char* GetAppRoot() const  override
        {