From f50e6c80c7271ba41cfb2a51c691f893538ba159 Mon Sep 17 00:00:00 2001 From: Eoin O'Neill Date: Sat, 10 Feb 2024 18:08:02 -0800 Subject: [PATCH] Fix regression where tile-specific materials were ignored. Regression stemmed from commit 48bed5050b4a2d695953ace409c577bdfefe0038 The material assigned to a tile is completely ignored in master unless this line is changed. --- scene/2d/tile_map_layer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp index df79b3fee6..17f613ae09 100644 --- a/scene/2d/tile_map_layer.cpp +++ b/scene/2d/tile_map_layer.cpp @@ -328,7 +328,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);