Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Engine/Level/Prefabs/Prefab.Apply.cpp
This commit is contained in:
@@ -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());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user