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

Reset the prefab root instance before removing the corresponding template (#2287)

Browse Source 
* Remove dirty entities correctly when prefab entities get destroyed

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Remove call to clear dirty entity for single entity delete

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Removed couple of asserts because order of operations is not fixed

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
srikappa-amzn
2021-07-21 13:42:46 -07:00
committed by GitHub
parent fbb9ed6618
commit d8c9c5178e
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+3 -1
View File
@@ -88,13 +88,15 @@ namespace AzToolsFramework
{
if (m_rootInstance)
{
AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
&AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
Prefab::TemplateId templateId = m_rootInstance->GetTemplateId();
m_rootInstance->Reset();
if (templateId != Prefab::InvalidTemplateId)
{
m_rootInstance->SetTemplateId(Prefab::InvalidTemplateId);
m_prefabSystemComponent->RemoveTemplate(templateId);
}
m_rootInstance->Reset();
m_rootInstance->SetContainerEntityName("Level");
}
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
+2 -19
View File
@@ -82,16 +82,7 @@ namespace AzToolsFramework
return;
}
// If this instance's templateId is valid, we should be able to unregister this instance from
// Template to Instance mapping successfully.
if (m_templateId != InvalidTemplateId &&
!m_templateInstanceMapper->UnregisterInstance(*this))
{
AZ_Assert(false,
"Prefab - Attempted to Unregister Instance from Template with Id '%u'. "
"Instance may never have been registered or was unregistered early.",
m_templateId);
}
m_templateInstanceMapper->UnregisterInstance(*this);
m_templateId = templateId;
@@ -221,15 +212,7 @@ namespace AzToolsFramework
void Instance::Reset()
{
// Clean up Instance associations.
if (m_templateId != InvalidTemplateId && !m_templateInstanceMapper->UnregisterInstance(*this))
{
AZ_Assert(
false,
"Prefab - Attempted to unregister Instance from Template on file path '%s' with Id '%u'. "
"Instance may never have been registered or was unregistered early.",
m_templateSourcePath.c_str(), m_templateId);
}
m_templateInstanceMapper->UnregisterInstance(*this);
ClearEntities();