Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -211,7 +211,7 @@ namespace UnitTest
        EXPECT_EQ(expectedResult, actualResult);

        AZStd::unique_ptr<Instance> convertedInstance(aznew Instance());
-        ASSERT_TRUE(AzToolsFramework::Prefab::PrefabDomUtils::LoadInstanceFromPrefabDom(*convertedInstance, m_prefabDom, false));
+        ASSERT_TRUE(AzToolsFramework::Prefab::PrefabDomUtils::LoadInstanceFromPrefabDom(*convertedInstance, m_prefabDom));

        convertedInstance->DetachNestedEntities(
            [this](AZStd::unique_ptr<AZ::Entity> entity)