summaryrefslogtreecommitdiff
path: root/tools
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 /tools
parent52666b88b39a91655553ba6ab5bbe47c09861e28 (diff)
parent86789c7071836b802e6edb0538ce6de2b7949c7b (diff)
Merge pull request #6519 from RandomShaper/enhance-tileset
Add modulate (color) to TileSet tiles
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/plugins/tile_set_editor_plugin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/plugins/tile_set_editor_plugin.cpp b/tools/editor/plugins/tile_set_editor_plugin.cpp
index 34002ee863..bb6236a6d6 100644
--- a/tools/editor/plugins/tile_set_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_set_editor_plugin.cpp
@@ -76,6 +76,8 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
p_library->tile_set_texture(id,texture);
p_library->tile_set_material(id,material);
+ p_library->tile_set_modulate(id,mi->get_modulate());
+
Vector2 phys_offset;
Size2 s;