birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A couple of minor fixes

Browse Source
This commit is contained in:
srikappa
2021-04-19 09:53:45 -07:00
parent 22d6e1ec0d
commit 889158e3a9
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ namespace AzToolsFramework
{
if (!m_instanceEntityMapper->RegisterEntityToInstance(entityId, *this))
{
AZ_Error("Prefab", false,
AZ_Assert(false,
"Prefab - Failed to register entity with id %s with a Prefab Instance derived from source asset %s "
"This entity is likely already registered. Check for a double add.",
entityId.ToString().c_str(),
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+6 -12
View File
@@ -119,10 +119,7 @@ namespace AzToolsFramework
newInstance->AddInstance(AZStd::move(instance));
}
/*
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
&AzToolsFramework::EditorEntityContextRequests::HandleEntitiesAdded, EntityList{containerEntity->GetId()});
*/
newInstance->SetTemplateSourcePath(filePath);
TemplateId newTemplateId = CreateTemplateFromInstance(*newInstance);
@@ -162,14 +159,14 @@ namespace AzToolsFramework
void PrefabSystemComponent::UpdatePrefabTemplate(TemplateId templateId, const PrefabDom& updatedDom)
{
auto templateRef = FindTemplate(templateId);
if (templateRef.has_value())
auto templateToUpdate = FindTemplate(templateId);
if (templateToUpdate)
{
PrefabDom& templateDomToUpdate = templateRef->get().GetPrefabDom();
PrefabDom& templateDomToUpdate = templateToUpdate->get().GetPrefabDom();
if (AZ::JsonSerialization::Compare(templateDomToUpdate, updatedDom) != AZ::JsonSerializerCompareResult::Equal)
{
templateDomToUpdate.CopyFrom(updatedDom, templateDomToUpdate.GetAllocator());
templateRef->get().MarkAsDirty(true);
templateToUpdate->get().MarkAsDirty(true);
PropagateTemplateChanges(templateId);
}
}
@@ -643,12 +640,9 @@ namespace AzToolsFramework
newLink.GetLinkDom().AddMember(rapidjson::StringRef(PrefabDomUtils::SourceName),
rapidjson::StringRef(sourceTemplate.GetFilePath().c_str()), newLink.GetLinkDom().GetAllocator());
PrefabDom linkPatchCopy;
linkPatchCopy.CopyFrom(linkPatch->get(), newLink.GetLinkDom().GetAllocator());
if (linkPatch && linkPatch->get().IsArray() && !(linkPatch->get().Empty()))
{
m_instanceToTemplatePropagator.AddPatchesToLink(linkPatchCopy, newLink);
m_instanceToTemplatePropagator.AddPatchesToLink(linkPatch.value(), newLink);
}
//update the target template dom to have the proper values for the source template dom