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

Merge pull request #28038 from CatThingy/area-error-fix 

Removed unnecessary error from _area_inout
This commit is contained in:
Rémi Verschelde 2019-04-16 10:35:29 +02:00 committed by GitHub
parent 4f81945fed 8166f8d3c8
commit f7b5fa8cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
ERR_FAIL_COND(!area_in && !E);
if (!area_in && !E) {
return; //likely removed from the tree
}
locked = true;
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);
ERR_FAIL_COND(!area_in && !E);
if (!area_in && !E) {
return; //likely removed from the tree
}
locked = true;