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

Fix Script deserialization if ParentID is not specified in stream

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-14 11:39:32 +02:00
parent 8b961f7239
commit a7cb12f597
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Engine/Scripting/Script.cpp
View File

@@ -324,19 +324,32 @@ void Script::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier
DESERIALIZE_BIT_MEMBER(Enabled, _enabled); DESERIALIZE_BIT_MEMBER(Enabled, _enabled);
DESERIALIZE_MEMBER(PrefabID, _prefabID); DESERIALIZE_MEMBER(PrefabID, _prefabID);
Guid parentId = Guid::Empty;
DESERIALIZE_MEMBER(ParentID, parentId);
const auto parent = Scripting::FindObject<Actor>(parentId);
if (_parent != parent)
{ {
if (_parent) const auto member = SERIALIZE_FIND_MEMBER(stream, "ParentID");
_parent->Scripts.RemoveKeepOrder(this); if (member != stream.MemberEnd())
_parent = parent; {
if (_parent) Guid parentId;
_parent->Scripts.Add(this); Serialization::Deserialize(member->value, parentId, modifier);
} const auto parent = Scripting::FindObject<Actor>(parentId);
else if (!parent && parentId.IsValid()) if (_parent != parent)
{ {
LOG(Warning, "Missing parent actor {0} for \'{1}\'", parentId, ToString()); if (IsDuringPlay())
{
SetParent(parent, false);
}
else
{
if (_parent)
_parent->Scripts.RemoveKeepOrder(this);
_parent = parent;
if (_parent)
_parent->Scripts.Add(this);
}
}
else if (!parent && parentId.IsValid())
{
LOG(Warning, "Missing parent actor {0} for \'{1}\'", parentId, ToString());
}
}
} }
} }