diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 11:15:49 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 11:15:49 -0300 |
commit | 1e65c3c7019be69526c71aa09175010ba4a8e09f (patch) | |
tree | 83bea3ffe2ba9c7aa4c068990ae07bcfaccdae6b /scene/2d | |
parent | 8dad6415b1acf4e2e4bd083eb95aacfc818ee339 (diff) |
remove error print in area collision, should be a valid situation, closes #2463
Diffstat (limited to 'scene/2d')
-rw-r--r-- | scene/2d/area_2d.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 5038752b22..eac3c0ce1a 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -383,7 +383,11 @@ void Area2D::_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, this should not be an error + continue; + //ERR_CONTINUE(!node); + if (!E->get().in_tree) continue; |