diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/code_editor.h | 1 | ||||
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 6 | ||||
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/editor/code_editor.h b/editor/code_editor.h index 2d233c61c6..5c71d23554 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -152,7 +152,6 @@ class CodeTextEditor : public VBoxContainer { Label *info; Timer *idle; Timer *code_complete_timer; - bool enable_complete_timer; Timer *font_resize_timer; int font_resize_val; 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 feba757a9c..e5551d385b 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -2263,7 +2263,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 |