GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spawning nested prefab with different root actor

Browse Source 
#1138
This commit is contained in:
Wojtek Figat
2023-06-11 20:43:31 +02:00
parent 60ddf0ea89
commit 958c7b2181
7 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Level/SceneObjectsFactory.cpp
View File

@@ -31,7 +31,7 @@ void SceneObjectsFactory::Context::SetupIdsMapping(const SceneObject* obj)
}
}
SceneObject* SceneObjectsFactory::Spawn(Context& context, ISerializable::DeserializeStream& stream)
SceneObject* SceneObjectsFactory::Spawn(Context& context, const ISerializable::DeserializeStream& stream)
{
// Get object id
Guid id = JsonTools::GetGuid(stream, "ID");
@@ -81,7 +81,7 @@ SceneObject* SceneObjectsFactory::Spawn(Context& context, ISerializable::Deseria
context.Modifier->IdsMapping[prefabObjectId] = id;
// Create prefab instance (recursive prefab loading to support nested prefabs)
obj = Spawn(context, *(ISerializable::DeserializeStream*)prefabData);
obj = Spawn(context, *prefabData);
}
else
{
@@ -584,7 +584,7 @@ void SceneObjectsFactory::SynchronizeNewPrefabInstance(Context& context, PrefabS
data.Modifier->IdsMapping[prefabObjectId] = id;
// Create prefab instance (recursive prefab loading to support nested prefabs)
auto child = Spawn(context, *(ISerializable::DeserializeStream*)prefabData);
auto child = Spawn(context, *prefabData);
if (!child)
{
LOG(Warning, "Failed to create object {1} from prefab {0}.", prefab->ToString(), prefabObjectId);