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

Procedural Prefabs: Don't activate prefab when saving to manifest (#4663)

Browse Source 
* Generate prefab group dom without activating prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix bad merge

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
This commit is contained in:
amzn-mike
2021-10-13 15:14:14 -05:00
committed by GitHub
parent 10ab1a369f
commit e7d7720d02
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupBehavior.cpp
+3 -17
View File
@@ -124,24 +124,10 @@ namespace AZ::SceneAPI::Behaviors
return {};
}
// create instance to update the asset hints
auto instance = prefabSystemComponentInterface->InstantiatePrefab(templateId);
if (!instance)
{
AZ_Error("prefab", false, "PrefabGroup(%s) Could not instantiate prefab", prefabGroup->GetName().c_str());
return {};
}
auto* instanceToTemplateInterface = AZ::Interface<InstanceToTemplateInterface>::Get();
if (!instanceToTemplateInterface)
{
AZ_Error("prefab", false, "Could not get InstanceToTemplateInterface");
return {};
}
// fill out a JSON DOM
const rapidjson::Document& generatedInstanceDom = prefabSystemComponentInterface->FindTemplateDom(templateId);
auto proceduralPrefab = AZStd::make_unique<rapidjson::Document>(rapidjson::kObjectType);
instanceToTemplateInterface->GenerateDomForInstance(*proceduralPrefab.get(), *instance.get());
proceduralPrefab->CopyFrom(generatedInstanceDom, proceduralPrefab->GetAllocator(), true);
return proceduralPrefab;
}