Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix root linkage for prefab instances copy pasted in Editor

Browse Source 
#3945
This commit is contained in:
Wojciech Figat
2026-03-30 10:13:25 +02:00
parent b3aeab777f
commit 71ff0c6362
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Level/Actor.cpp
+34 -4
View File
@@ -1185,11 +1185,15 @@ void Actor::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
} }
else if (!parent && parentId.IsValid()) else if (!parent && parentId.IsValid())
{ {
// Skip warning if object was mapped to empty id (intentionally ignored)
Guid tmpId; Guid tmpId;
if (_prefabObjectID.IsValid()) if (!modifier->IdsMapping.TryGet(parentId, tmpId) || tmpId.IsValid())
LOG(Warning, "Missing parent actor {0} for \'{1}\', prefab object {2}", parentId, ToString(), _prefabObjectID); {
else if (!modifier->IdsMapping.TryGet(parentId, tmpId) || tmpId.IsValid()) // Skip warning if object was mapped to empty id (intentionally ignored) if (_prefabObjectID.IsValid())
LOG(Warning, "Missing parent actor {0} for \'{1}\'", parentId, ToString()); LOG(Warning, "Missing parent actor {0} for \'{1}\', prefab object {2}", parentId, ToString(), _prefabObjectID);
else
LOG(Warning, "Missing parent actor {0} for \'{1}\'", parentId, ToString());
}
} }
} }
} }
@@ -1862,6 +1866,32 @@ bool Actor::FromBytes(const Span<byte>& data, Array<Actor*>& output, ISerializeM
sceneObjects->Resize(objectsCount); sceneObjects->Resize(objectsCount);
SceneObjectsFactory::Context context(modifier); SceneObjectsFactory::Context context(modifier);
// Fix root linkage for prefab instances (eg. when user duplicates a sub-prefab actor but not a root one)
SceneObjectsFactory::PrefabSyncData prefabSyncData(*sceneObjects.Value, document, modifier);
SceneObjectsFactory::SetupPrefabInstances(context, prefabSyncData);
for (auto& instance : context.Instances)
{
Guid prefabObjectId;
if (!JsonTools::GetGuidIfValid(prefabObjectId, document[instance.RootIndex], "PrefabObjectID"))
continue;
// Get the original object from prefab
SceneObject* prefabObject = instance.Prefab->GetDefaultInstance(prefabObjectId);
if (prefabObject && prefabObject->GetParent())
{
// Add empty mapping to parent object in prefab to prevent linking to it
auto prefabObjectParentId = prefabObject->GetParent()->GetPrefabObjectID();
instance.IdsMapping[prefabObjectParentId] = Guid::Empty;
modifier->IdsMapping[prefabObjectParentId] = Guid::Empty;
Guid nestedPrefabId, nestedPrefabObjectId;
if (instance.Prefab->GetNestedObject(prefabObjectParentId, nestedPrefabId, nestedPrefabObjectId))
{
instance.IdsMapping[nestedPrefabObjectId] = Guid::Empty;
modifier->IdsMapping[nestedPrefabObjectId] = Guid::Empty;
}
}
}
// Deserialize objects // Deserialize objects
Scripting::ObjectsLookupIdMapping.Set(&modifier->IdsMapping); Scripting::ObjectsLookupIdMapping.Set(&modifier->IdsMapping);
for (int32 i = 0; i < objectsCount; i++) for (int32 i = 0; i < objectsCount; i++)