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

Avoid creating a new list for non-container top level entities

Browse Source
This commit is contained in:
srikappa
2021-05-17 18:51:23 -07:00
parent eb873f246a
commit 761a77a436
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+6 -11
View File
@@ -63,7 +63,7 @@ namespace AzToolsFramework
PrefabOperationResult PrefabPublicHandler::CreatePrefab(const AZStd::vector<AZ::EntityId>& entityIds, AZ::IO::PathView filePath)
{
EntityList inputEntityList, topLevelEntities, topLevelNonContainerEntities;
EntityList inputEntityList, topLevelEntities;
AZ::EntityId commonRootEntityId;
InstanceOptionalReference commonRootEntityOwningInstance;
PrefabOperationResult findCommonRootOutcome = FindCommonRootOwningInstance(
@@ -73,14 +73,6 @@ namespace AzToolsFramework
return findCommonRootOutcome;
}
for (AZ::Entity* toplevelentity : topLevelEntities)
{
if (!IsInstanceContainerEntity(toplevelentity->GetId()))
{
topLevelNonContainerEntities.push_back(toplevelentity);
}
}
InstanceOptionalReference instanceToCreate;
{
// Initialize Undo Batch object
@@ -132,9 +124,12 @@ namespace AzToolsFramework
// Parent the non-container top level entities to the container entity.
// Parenting the top level container entities will be done during the creation of links.
for (AZ::Entity* entity : topLevelNonContainerEntities)
for (AZ::Entity* topLevelEntity : topLevelEntities)
{
AZ::TransformBus::Event(entity->GetId(), &AZ::TransformBus::Events::SetParent, containerEntityId);
if (!IsInstanceContainerEntity(topLevelEntity->GetId()))
{
AZ::TransformBus::Event(topLevelEntity->GetId(), &AZ::TransformBus::Events::SetParent, containerEntityId);
}
}
// Update the template of the instance since the entities are modified since the template creation.