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

Better handle the default case for Instantiate

Browse Source
This commit is contained in:
daimini
2021-04-22 14:53:07 -07:00
parent cf4bbe569b
commit c9a4b6f50b
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+12 -9
View File
@@ -155,24 +155,27 @@ namespace AzToolsFramework
auto prefabEditorEntityOwnershipInterface = AZ::Interface<PrefabEditorEntityOwnershipInterface>::Get();
if (!prefabEditorEntityOwnershipInterface)
{
return AZ::Failure(AZStd::string("Could not create a new prefab out of the entities provided - internal error "
return AZ::Failure(AZStd::string("Could not instantiate prefab - internal error "
"(PrefabEditorEntityOwnershipInterface unavailable)."));
}
auto instanceToParentUnder = m_instanceEntityMapperInterface->FindOwningInstance(parent);
InstanceOptionalReference instanceToParentUnder;
if (!instanceToParentUnder)
// Get parent entity and owning instance
if (parent.IsValid())
{
instanceToParentUnder = prefabEditorEntityOwnershipInterface->GetRootPrefabInstance();
if (!parent.IsValid())
{
parent = instanceToParentUnder->get().GetContainerEntityId();
}
instanceToParentUnder = m_instanceEntityMapperInterface->FindOwningInstance(parent);
}
if (!instanceToParentUnder.has_value())
{
instanceToParentUnder = prefabEditorEntityOwnershipInterface->GetRootPrefabInstance();
parent = instanceToParentUnder->get().GetContainerEntityId();
}
{
// Initialize Undo Batch object
ScopedUndoBatch undoBatch("Initialize Prefab");
ScopedUndoBatch undoBatch("Instantiate Prefab");
PrefabDom instanceToParentUnderDomBeforeCreate;
m_instanceToTemplateInterface->GenerateDomForInstance(