Merge pull request godotengine#7954 from Hinsbart/tilemap_self_modulate

TileMap: Respect self_modulate property
kstanki2 · Mar 5, 2017 · 532f6d4 · 532f6d4
2 parents e6952ca + 962243f
commit 532f6d4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
@@ -458,6 +458,9 @@ void TileMap::_update_dirty_quadrants() {
 
 
 			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()) {
 				tex->draw_rect(canvas_item,rect,false,modulate,c.transpose);
 			} else {