diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-22 17:02:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 17:02:34 +0200 |
| commit | 3ccff61979140493e4987f16558b5fab39b4b2b7 (patch) | |
| tree | 6dc1d5e0f365900cdf783532a22d87098eb314e4 /scene/2d/tile_map.cpp | |
| parent | e21db7723a260c1960576598d6e163a65b8345c7 (diff) | |
| parent | b3fe2732e3a540960ae4bed0ef69b5dd8939ee08 (diff) | |
| download | redot-engine-3ccff61979140493e4987f16558b5fab39b4b2b7.tar.gz | |
Merge pull request #58544 from Calinou/tileset-source-allow-canvasitemmaterial
Diffstat (limited to 'scene/2d/tile_map.cpp')
| -rw-r--r-- | scene/2d/tile_map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<TileMapQuadrant>::List q.occluders.clear(); // Those allow to group cell per material or z-index. - Ref<ShaderMaterial> prev_material; + Ref<Material> prev_material; int prev_z_index = 0; RID prev_canvas_item; @@ -1129,7 +1129,7 @@ void TileMap::_rendering_update_dirty_quadrants(SelfList<TileMapQuadrant>::List tile_data = atlas_source->get_tile_data(c.get_atlas_coords(), c.alternative_tile); } - Ref<ShaderMaterial> mat = tile_data->get_material(); + Ref<Material> mat = tile_data->get_material(); int z_index = tile_data->get_z_index(); // Quandrant pos. |