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 /tools/editor/plugins/tile_set_editor_plugin.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 'tools/editor/plugins/tile_set_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/tile_set_editor_plugin.cpp | 2 |
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 9172e0fc5..dd6edaf82 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; |