diff options
| author | Pedro J. Estébanez | 2017-07-10 16:20:56 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez | 2017-07-10 16:20:56 +0200 |
| commit | 7d308797ad69acb7d2baf1ebbe6539843e194d26 (patch) | |
| tree | 18fe728550458ee4467ae41100cd320cb8880fde /scene/3d/area.cpp | |
| parent | f4ff452a58b46b4ed8429eeeb32bfe766acc829a (diff) | |
| download | godot-7d308797ad69acb7d2baf1ebbe6539843e194d26.tar.gz godot-7d308797ad69acb7d2baf1ebbe6539843e194d26.tar.zst godot-7d308797ad69acb7d2baf1ebbe6539843e194d26.zip | |
Diffstat (limited to 'scene/3d/area.cpp')
| -rw-r--r-- | scene/3d/area.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 39a4e926b..c62a866d8 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -227,7 +227,11 @@ void Area::_clear_monitoring() { Object *obj = ObjectDB::get_instance(E->key()); Node *node = obj ? obj->cast_to<Node>() : NULL; - ERR_CONTINUE(!node); + + if (!node) //node may have been deleted in previous frame or at other legiminate point + continue; + //ERR_CONTINUE(!node); + if (!E->get().in_tree) continue; @@ -253,7 +257,11 @@ void Area::_clear_monitoring() { Object *obj = ObjectDB::get_instance(E->key()); Node *node = obj ? obj->cast_to<Node>() : NULL; - ERR_CONTINUE(!node); + + if (!node) //node may have been deleted in previous frame or at other legiminate point + continue; + //ERR_CONTINUE(!node); + if (!E->get().in_tree) continue; |