Merge branch 'main' into Prefab/RemoveUndoCacheDependency

2021-05-26 10:47:35 -07:00
parent 5a41746683 63ce0c1a62
commit 7d3dcf85f6
400 changed files with 34444 additions and 4499 deletions
@@ -41,7 +41,7 @@ namespace AzToolsFramework
            
            [[maybe_unused]] bool result =
                settingsRegistry->Get(m_projectPathWithOsSeparator.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath);
-            AZ_Assert(result, "Couldn't retrieve project root path");
+            AZ_Warning("Prefab", result, "Couldn't retrieve project root path");
            m_projectPathWithSlashSeparator = AZ::IO::Path(m_projectPathWithOsSeparator.Native(), '/').MakePreferred();

            AZ::Interface<PrefabLoaderInterface>::Register(this);