Merge remote-tracking branch 'origin/master' into 1.10

# Conflicts:
#	Source/Engine/Level/Prefabs/Prefab.Apply.cpp
This commit is contained in:
Wojtek Figat
2025-02-27 17:17:02 +01:00
40 changed files with 405 additions and 170 deletions

View File

@@ -246,9 +246,7 @@ SceneObject* SceneObjectsFactory::Spawn(Context& context, const ISerializable::D
void SceneObjectsFactory::Deserialize(Context& context, SceneObject* obj, ISerializable::DeserializeStream& stream)
{
#if ENABLE_ASSERTION
CHECK(obj);
#endif
CHECK_DEBUG(obj);
ISerializeModifier* modifier = context.GetModifier();
LogContextScope logContext(obj->GetID());