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

Merge pull request #2247 from aws-lumberyard-dev/Prefab/ClearEntityMapsTogether

Browse Source 
Remove container entity from all maps when entities are cleared from a prefab instance
This commit is contained in:
lumberyard-employee-dm
2021-07-19 14:12:51 -05:00
committed by GitHub
parent 2bf29dca75 ef68a07a40
commit 4d927cb26e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
+5 -1
View File
@@ -237,7 +237,6 @@ namespace AzToolsFramework
if (m_containerEntity) if (m_containerEntity)
{ {
m_instanceEntityMapper->UnregisterEntity(m_containerEntity->GetId());
m_containerEntity.reset(aznew AZ::Entity()); m_containerEntity.reset(aznew AZ::Entity());
RegisterEntity(m_containerEntity->GetId(), GenerateEntityAlias()); RegisterEntity(m_containerEntity->GetId(), GenerateEntityAlias());
} }
@@ -265,6 +264,11 @@ namespace AzToolsFramework
void Instance::ClearEntities() void Instance::ClearEntities()
{ {
if (m_containerEntity)
{
m_instanceEntityMapper->UnregisterEntity(m_containerEntity->GetId());
}
for (const auto&[entityAlias, entity] : m_entities) for (const auto&[entityAlias, entity] : m_entities)
{ {
if (entity) if (entity)
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
-1
View File
@@ -168,7 +168,6 @@ namespace AzToolsFramework
if (instance->m_containerEntity) if (instance->m_containerEntity)
{ {
instance->m_instanceEntityMapper->UnregisterEntity(instance->m_containerEntity->GetId());
instance->m_containerEntity.reset(); instance->m_containerEntity.reset();
} }