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

Fix calling script OnDestroy when removing actors or scripts from the scene

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-18 21:43:13 +01:00
parent 72f45afa45
commit bc2e130281
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Engine/Level/Actor.cpp
View File

@@ -206,10 +206,18 @@ void Actor::OnDeleteObject()
#endif
for (int32 i = 0; i < Scripts.Count(); i++)
{
auto e = Scripts[i];
ASSERT(e->_parent == this);
e->_parent = nullptr;
e->DeleteObject();
auto script = Scripts[i];
ASSERT(script->_parent == this);
if (script->_wasAwakeCalled)
{
script->_wasAwakeCalled = false;
CHECK_EXECUTE_IN_EDITOR
{
script->OnDestroy();
}
}
script->_parent = nullptr;
script->DeleteObject();
}
#if BUILD_DEBUG
ASSERT(callsCheck == Scripts.Count());
@@ -889,9 +897,13 @@ void Actor::EndPlay()
for (auto* script : Scripts)
{
CHECK_EXECUTE_IN_EDITOR
if (script->_wasAwakeCalled)
{
script->OnDestroy();
script->_wasAwakeCalled = false;
CHECK_EXECUTE_IN_EDITOR
{
script->OnDestroy();
}
}
}