diff options
author | andriyDev <andriydzikh@gmail.com> | 2020-09-23 15:49:50 -0400 |
---|---|---|
committer | andriyDev <andriydzikh@gmail.com> | 2021-06-05 00:55:25 -0700 |
commit | 9f4bf5ec8058340541ee6e35bc15015fe576a3e6 (patch) | |
tree | 8578567c279e9e31800c82ac8667e1e18e2b6a02 /scene/resources/tile_set.cpp | |
parent | 8363ee6f8d398529d2db0e481fea82ccc9dcda31 (diff) | |
download | redot-engine-9f4bf5ec8058340541ee6e35bc15015fe576a3e6.tar.gz |
Deleted YSort, moved its functionality directly into Node2D.
YSort now has a compatibility alias to Node2D.
Updated TileMap to use the existing Node2D y_sort_enabled property instead
of its own property.
Updated Node2D doc to include the new y_sort_enabled member.
Updated TileMap doc to remove its mention of cell_y_sort.
Deleted YSort doc.
Diffstat (limited to 'scene/resources/tile_set.cpp')
-rw-r--r-- | scene/resources/tile_set.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 2c2c8ea0e8..2220df06f6 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -3870,8 +3870,8 @@ void TileSetPluginAtlasRendering::tilemap_notification(TileMap *p_tile_map, int } break; case CanvasItem::NOTIFICATION_DRAW: { Ref<TileSet> tile_set = p_tile_map->get_tileset(); - if (tile_set.is_valid()) { - RenderingServer::get_singleton()->canvas_item_set_sort_children_by_y(p_tile_map->get_canvas_item(), tile_set->is_y_sorting()); + if (tile_set.is_valid() || p_tile_map->is_y_sort_enabled()) { + RenderingServer::get_singleton()->canvas_item_set_sort_children_by_y(p_tile_map->get_canvas_item(), tile_set->is_y_sorting() || p_tile_map->is_y_sort_enabled()); } } break; } |