godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed error that should not be an error, fixes #21088

This commit is contained in:
Juan Linietsky 2018-11-28 18:40:58 -03:00
parent 43f28452e1
commit 5b8dde4b4a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/2d/area_2d.cpp
View File

@ -158,7 +158,9 @@ void Area2D::_body_inout(int p_status, const RID &p_body, int p_instance, int p_
Map<ObjectID, BodyState>::Element *E = body_map.find(objid); Map<ObjectID, BodyState>::Element *E = body_map.find(objid);
ERR_FAIL_COND(!body_in && !E); if (!body_in && !E) {
return; //does not exist because it was likely removed from the tree
}
locked = true; locked = true;

4
scene/3d/area.cpp
View File

@ -157,7 +157,9 @@ void Area::_body_inout(int p_status, const RID &p_body, int p_instance, int p_bo
Map<ObjectID, BodyState>::Element *E = body_map.find(objid); Map<ObjectID, BodyState>::Element *E = body_map.find(objid);
ERR_FAIL_COND(!body_in && !E); if (!body_in && !E) {
return; //likely removed from the tree
}
locked = true; locked = true;