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

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

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-11 23:49:33 +01:00
parent fef2e09915 8f2bc17a94
commit d719c381ea
119 changed files with 1922 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Scripting/Scripting.cpp
View File

@@ -852,10 +852,12 @@ void ScriptingObjectReferenceBase::OnSet(ScriptingObject* object)
void ScriptingObjectReferenceBase::OnDeleted(ScriptingObject* obj)
{
ASSERT(_object == obj);
_object->Deleted.Unbind<ScriptingObjectReferenceBase, &ScriptingObjectReferenceBase::OnDeleted>(this);
_object = nullptr;
Changed();
if (_object == obj)
{
_object->Deleted.Unbind<ScriptingObjectReferenceBase, &ScriptingObjectReferenceBase::OnDeleted>(this);
_object = nullptr;
Changed();
}
}
ScriptingObject* Scripting::FindObject(Guid id, MClass* type)