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
@@ -842,7 +842,6 @@ namespace UnitTest
            m_application = new AzFramework::Application();
            m_assetRoot = UnitTest::GetTestFolderPath();
            m_application->NormalizePathKeepCase(m_assetRoot);
-            m_application->SetAssetRoot(m_assetRoot.c_str());
            m_assetCatalog = aznew AzFramework::AssetCatalog();

            m_firstAssetId = AssetId(AZ::Uuid::CreateRandom(), 0);