Browse Source

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

Fix regression where a tile's custom material was ignored
Rémi Verschelde 1 year ago
parent
commit
8b72165b5f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      scene/2d/tile_map_layer.cpp

+ 1 - 1
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_material(ci, mat->get_rid());
 						}
 						}
 						rs->canvas_item_set_parent(ci, get_canvas_item());
 						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);
 						Transform2D xform(0, rendering_quadrant->canvas_items_position);
 						rs->canvas_item_set_transform(ci, xform);
 						rs->canvas_item_set_transform(ci, xform);