summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-14 16:52:16 -0300
committerGitHub <noreply@github.com>2017-01-14 16:52:16 -0300
commit94609305a021305db2a02c63890f9e23c37d0dd8 (patch)
tree43bca91ad666008664b416e2211e3b6d0896c333 /scene/2d
parent52666b88b39a91655553ba6ab5bbe47c09861e28 (diff)
parent86789c7071836b802e6edb0538ce6de2b7949c7b (diff)
Merge pull request #6519 from RandomShaper/enhance-tileset
Add modulate (color) to TileSet tiles
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/tile_map.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index a7bb53bf63..d6d713920c 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);