diff options
| author | Juan Linietsky | 2015-01-03 00:57:02 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-01-03 00:57:02 -0300 |
| commit | 60afd79a6e2354e0254c280d826bc6f12f68ffa1 (patch) | |
| tree | 6de8b8d5720c601586c6c7688aac5b0651dc9eb8 /tools/editor/plugins/tile_map_editor_plugin.cpp | |
| parent | fa7a3ac0d329f7e3e7ade9cd530880af2da7b7dd (diff) | |
| download | godot-60afd79a6e2354e0254c280d826bc6f12f68ffa1.tar.gz godot-60afd79a6e2354e0254c280d826bc6f12f68ffa1.tar.zst godot-60afd79a6e2354e0254c280d826bc6f12f68ffa1.zip | |
-added a check for setget while running the game , closes #1009
-fixed issues in tilemap editor (swap arrows not showing/hiding properly)
Diffstat (limited to 'tools/editor/plugins/tile_map_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/tile_map_editor_plugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 21474205d..118ddc97e 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -728,7 +728,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) { add_child(palette); // Add menu items - HBoxContainer *canvas_item_editor_hb = memnew( HBoxContainer ); + canvas_item_editor_hb = memnew( HBoxContainer ); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(canvas_item_editor_hb); canvas_item_editor_hb->add_child( memnew( VSeparator )); mirror_x = memnew( ToolButton ); @@ -741,6 +741,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) { mirror_y->set_tooltip("Mirror Y (S)"); mirror_y->set_focus_mode(FOCUS_NONE); canvas_item_editor_hb->add_child(mirror_y); + canvas_item_editor_hb->hide(); tool=TOOL_NONE; selection_active=false; @@ -762,10 +763,12 @@ void TileMapEditorPlugin::make_visible(bool p_visible) { if (p_visible) { tile_map_editor->show(); + tile_map_editor->get_canvas_item_editor_hb()->show(); } else { tile_map_editor->hide(); + tile_map_editor->get_canvas_item_editor_hb()->hide(); tile_map_editor->edit(NULL); } |