Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts: # Content/Editor/DebugMaterials/DDGIDebugProbes.flax # Source/Editor/Windows/OutputLogWindow.cs # Source/Engine/Level/Actor.cpp
This commit is contained in:
@@ -916,6 +916,8 @@ ScriptingObject* Scripting::FindObject(Guid id, const MClass* type)
|
||||
if (idsMapping)
|
||||
{
|
||||
idsMapping->TryGet(id, id);
|
||||
if (!id.IsValid())
|
||||
return nullptr; // Skip warning if object was mapped to empty id (intentionally ignored)
|
||||
}
|
||||
|
||||
// Try to find it
|
||||
|
||||
Reference in New Issue
Block a user