From b3fe2732e3a540960ae4bed0ef69b5dd8939ee08 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 26 Feb 2022 00:24:08 +0100 Subject: Allow using CanvasItemMaterial in the TileSet editor Previously, only ShaderMaterial overrides could be added. --- scene/2d/tile_map.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/2d') diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 6d04dcdc71..9c4b0feea2 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -1090,7 +1090,7 @@ void TileMap::_rendering_update_dirty_quadrants(SelfList::List q.occluders.clear(); // Those allow to group cell per material or z-index. - Ref prev_material; + Ref prev_material; int prev_z_index = 0; RID prev_canvas_item; @@ -1129,7 +1129,7 @@ void TileMap::_rendering_update_dirty_quadrants(SelfList::List tile_data = atlas_source->get_tile_data(c.get_atlas_coords(), c.alternative_tile); } - Ref mat = tile_data->get_material(); + Ref mat = tile_data->get_material(); int z_index = tile_data->get_z_index(); // Quandrant pos. -- cgit v1.2.3