diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-13 11:25:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-13 11:25:06 +0100 |
| commit | 8b72165b5f89ad40f2d099b32bf224b1a09435f5 (patch) | |
| tree | 548560fa7b2710b0cc5f86ec90eb0fe8c7f83182 | |
| parent | d3a8ae8b862659036012fdd7320e48b57701ea51 (diff) | |
| parent | f50e6c80c7271ba41cfb2a51c691f893538ba159 (diff) | |
| download | redot-engine-8b72165b5f89ad40f2d099b32bf224b1a09435f5.tar.gz | |
Merge pull request #88190 from Eoin-ONeill-Yokai/bugfix/materials-tilemap2d
Fix regression where a tile's custom material was ignored
| -rw-r--r-- | scene/2d/tile_map_layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp index 0888852de5..bc052f9034 100644 --- a/scene/2d/tile_map_layer.cpp +++ b/scene/2d/tile_map_layer.cpp @@ -325,7 +325,7 @@ void TileMapLayer::_rendering_update() { rs->canvas_item_set_material(ci, mat->get_rid()); } rs->canvas_item_set_parent(ci, get_canvas_item()); - rs->canvas_item_set_use_parent_material(ci, true); + rs->canvas_item_set_use_parent_material(ci, !mat.is_valid()); Transform2D xform(0, rendering_quadrant->canvas_items_position); rs->canvas_item_set_transform(ci, xform); |