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
@@ -184,7 +184,6 @@ namespace UnitTest
            AzToolsFramework::Components::PropertyManagerComponent::CreateDescriptor();

            const char* dir = m_componentApplication->GetExecutableFolder();
-            m_componentApplication->SetAssetRoot(dir);

            m_localFileIO.SetAlias("@assets@", dir);
            m_localFileIO.SetAlias("@devassets@", dir);