Fix issues with tilemap covering child nodes and old quadrants

Closes #4070

1 files changed, 9 insertions, 0 deletions

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 34a67c088f..1f16b36466 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -504,6 +504,7 @@ void TileMap::_update_dirty_quadrants() {
 		}
 
 		dirty_quadrant_list.remove( dirty_quadrant_list.first() );
+		quadrant_order_dirty=true;
 	}
 
 
@@ -524,6 +525,14 @@ void TileMap::_update_dirty_quadrants() {
 		quadrant_order_dirty=false;
 	}
 
+	for(int i=0;i<get_child_count();i++) {
+
+		CanvasItem *c=get_child(i)->cast_to<CanvasItem>();
+
+		if (c)
+			VS::get_singleton()->canvas_item_raise(c->get_canvas_item());
+	}
+
 	_recompute_rect_cache();
 
 }