diff options
| author | Rémi Verschelde | 2017-03-01 10:08:01 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-01 10:08:01 +0100 |
| commit | 43574f65dadd1804dc3fea9812dc60ae59af1e71 (patch) | |
| tree | 45cf7707320fa0697521b7c81e29b269decf5b29 /scene/2d/tile_map.cpp | |
| parent | d79f44da628f35ed7ca7ee6d4e5bb8555028c611 (diff) | |
| parent | b6721caa13e4bd9fdbf849037baf4fd19243f742 (diff) | |
| download | godot-43574f65dadd1804dc3fea9812dc60ae59af1e71.tar.gz godot-43574f65dadd1804dc3fea9812dc60ae59af1e71.tar.zst godot-43574f65dadd1804dc3fea9812dc60ae59af1e71.zip | |
Merge pull request #7909 from RandomShaper/cp-tileset-modulate-2.1
Cherry-pick modulate (color) for TileSet tiles (2.1)
Diffstat (limited to 'scene/2d/tile_map.cpp')
| -rw-r--r-- | scene/2d/tile_map.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 8f200979c..bcc973c7e 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -457,10 +457,11 @@ void TileMap::_update_dirty_quadrants() { } + Color modulate = tile_set->tile_get_modulate(c.id); if (r==Rect2()) { - tex->draw_rect(canvas_item,rect,false,Color(1,1,1),c.transpose); + tex->draw_rect(canvas_item,rect,false,modulate,c.transpose); } else { - tex->draw_rect_region(canvas_item,rect,r,Color(1,1,1),c.transpose); + tex->draw_rect_region(canvas_item,rect,r,modulate,c.transpose); } Vector< Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id); |