Browse Source

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

Removed unnecessary error from _area_inout
Rémi Verschelde 6 years ago
parent
commit
f7b5fa8cf2
2 changed files with 6 additions and 3 deletions
  1. 3 2
      scene/2d/area_2d.cpp
  2. 3 1
      scene/3d/area.cpp

+ 3 - 2
scene/2d/area_2d.cpp

@@ -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) {

+ 3 - 1
scene/3d/area.cpp

@@ -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;