diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-21 10:05:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 10:05:53 +0100 |
| commit | 83c3cba64098fd11d3a4527ec7e3f5e19854cb29 (patch) | |
| tree | 10676ea7f6a6f6d1e8ccd7023682324724f34be5 /editor/plugins | |
| parent | f3cb236f9d0e559e759dabc7cb5b6c1368d45e6e (diff) | |
| parent | 21bad78bd82061f0e71bd52cf1ab783974b6031b (diff) | |
Merge pull request #24508 from guilhermefelipecgs/fix_22756
Fixes for TileSetEditor and TileMapEditor
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 6 | ||||
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index d3a3289a18..c9367edec6 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -516,6 +516,12 @@ void TileMapEditor::_update_palette() { manual_palette->set_current(selected); manual_palette->show(); } + + if (tileset->tile_get_tile_mode(sel_tile) == TileSet::AUTO_TILE) { + manual_button->show(); + } else { + manual_button->hide(); + } } void TileMapEditor::_pick_tile(const Point2 &p_pos) { diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index cab9a4297d..d6357f7c3b 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -2260,7 +2260,7 @@ void TileSetEditor::update_workspace_tile_mode() { tool_editmode[EDITMODE_BITMASK]->hide(); tool_editmode[EDITMODE_PRIORITY]->hide(); tool_editmode[EDITMODE_Z_INDEX]->hide(); - } else if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == TileSet::ATLAS_TILE) { + } else if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::AUTO_TILE) { if (edit_mode == EDITMODE_ICON) select_coord(tileset->autotile_get_icon_coordinate(get_current_tile())); else |