Make prefab patch application use a best effort mechanism

Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 11:58:14 -07:00
parent c4a50b961e
commit b7e3db9d82
8 changed files with 123 additions and 20 deletions
@@ -96,8 +96,8 @@ namespace UnitTest

        //apply the patch
        PrefabDom& templateDomReference = m_prefabSystemComponent->FindTemplateDom(nestedTemplateId);
-        AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ApplyPatch(templateDomReference,
-            templateDomReference.GetAllocator(), patch, AZ::JsonMergeApproach::JsonPatch);
+        AZ::JsonSerializationResult::ResultCode result =
+            PrefabDomUtils::ApplyPatches(templateDomReference, templateDomReference.GetAllocator(), patch);

        AZ_Error("Prefab", result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::Success,
            "Patch was not successfully applied");