Merge pull request #88190 from Eoin-ONeill-Yokai/bugfix/materials-til…

…emap2d Fix regression where a tile's custom material was ignored
godotengine · Feb 13, 2024 · 8b72165 · 8b72165
2 parents d3a8ae8 + f50e6c8
commit 8b72165
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);