godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

-added a check for setget while running the game , closes #1009

Browse Source 
-fixed issues in tilemap editor (swap arrows not showing/hiding properly)
This commit is contained in:
Juan Linietsky
2015-01-03 00:57:02 -03:00
parent fa7a3ac0d3
commit 60afd79a6e
3 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -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);
}