summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-19 12:49:03 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-03-19 12:49:03 +0100
commit77949f02d95966ee49423844f7e20415f908d5a3 (patch)
tree0dfe2848286bb4d36acc7361012da09974da4c6c
parent3eddd46fa81cc51ecb3974da7a12883c6bedbe10 (diff)
parent2a581835cab08aef79136ed7b765e25db546bba1 (diff)
Merge pull request #4088 from bojidar-bg/PR-fix-tilemap-z
Fix issues with tilemap covering child nodes and old quadrants
-rw-r--r--scene/2d/tile_map.cpp9
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();
}