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

Removed unnecessary error from _area_inout 

The error was previously removed from _body_inout
for the same reason. Fixes #28022.

(cherry picked from commit 8166f8d3c8)
This commit is contained in:
CatThingy 2019-04-14 19:31:51 -07:00 committed by Rémi Verschelde
parent 7ddd4f7232
commit 4da40c39f1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/2d/area_2d.cpp
View File

@ -261,8 +261,9 @@ void Area2D::_area_inout(int p_status, const RID &p_area, int p_instance, int p_
Map<ObjectID, AreaState>::Element *E = area_map.find(objid); Map<ObjectID, AreaState>::Element *E = area_map.find(objid);
ERR_FAIL_COND(!area_in && !E); if (!area_in && !E) {
return; //likely removed from the tree
}
locked = true; locked = true;
if (area_in) { if (area_in) {

4
scene/3d/area.cpp
View File

@ -356,7 +356,9 @@ void Area::_area_inout(int p_status, const RID &p_area, int p_instance, int p_ar
Map<ObjectID, AreaState>::Element *E = area_map.find(objid); Map<ObjectID, AreaState>::Element *E = area_map.find(objid);
ERR_FAIL_COND(!area_in && !E); if (!area_in && !E) {
return; //likely removed from the tree
}
locked = true; locked = true;