瀏覽代碼

Merge pull request #7954 from Hinsbart/tilemap_self_modulate

TileMap: Respect self_modulate property
Rémi Verschelde 8 年之前
父節點
當前提交
532f6d4b43
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      scene/2d/tile_map.cpp

+ 3 - 0
scene/2d/tile_map.cpp

@@ -458,6 +458,9 @@ void TileMap::_update_dirty_quadrants() {
 
 
 
 
 			Color modulate = tile_set->tile_get_modulate(c.id);
 			Color modulate = tile_set->tile_get_modulate(c.id);
+			Color self_modulate = get_self_modulate();
+			modulate = Color(modulate.r*self_modulate.r, modulate.g*self_modulate.g,
+					 modulate.b*self_modulate.b, modulate.a*self_modulate.a);
 			if (r==Rect2()) {
 			if (r==Rect2()) {
 				tex->draw_rect(canvas_item,rect,false,modulate,c.transpose);
 				tex->draw_rect(canvas_item,rect,false,modulate,c.transpose);
 			} else {
 			} else {