summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorCarl Olsson <carl.olsson@gmail.com>2015-02-03 19:51:21 +1000
committerCarl Olsson <carl.olsson@gmail.com>2015-02-03 19:51:21 +1000
commitafa13bf868239191bf2ef95ff3b039729f4bd2e1 (patch)
tree91e61e152b5342c0be36e76c7b45c59a2a798fdf /tools/editor
parent52700563bc35f7dcfdae7650a40d6249252b64d8 (diff)
Forgot to update tile transform buttons when picking tiles.
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/plugins/tile_map_editor_plugin.cpp8
-rw-r--r--tools/editor/plugins/tile_map_editor_plugin.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index ba23c018cc..7dbbda7135 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -127,7 +127,7 @@ void TileMapEditor::_update_palette() {
TreeItem *root = palette->create_item();
- //palette->set_hide_root(true);
+ palette->set_hide_root(true);
List<int> tiles;
tileset->get_tile_list(&tiles);
@@ -250,6 +250,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
mirror_x->set_pressed(node->is_cell_x_flipped(over_tile.x, over_tile.y));
mirror_y->set_pressed(node->is_cell_y_flipped(over_tile.x, over_tile.y));
transpose->set_pressed(node->is_cell_transposed(over_tile.x, over_tile.y));
+ _update_transform_buttons();
canvas_item_editor->update();
return true;
} else {
@@ -394,6 +395,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
mirror_x->set_pressed(node->is_cell_x_flipped(over_tile.x, over_tile.y));
mirror_y->set_pressed(node->is_cell_y_flipped(over_tile.x, over_tile.y));
transpose->set_pressed(node->is_cell_transposed(over_tile.x, over_tile.y));
+ _update_transform_buttons();
canvas_item_editor->update();
return true;
}
@@ -731,9 +733,9 @@ TileMapEditor::CellOp TileMapEditor::_get_op_from_cell(const Point2i& p_pos)
}
void TileMapEditor::_update_transform_buttons(Object *p_button) {
- ERR_FAIL_NULL(p_button);
+ //ERR_FAIL_NULL(p_button);
ToolButton *b=p_button->cast_to<ToolButton>();
- ERR_FAIL_COND(!b);
+ //ERR_FAIL_COND(!b);
mirror_x->set_block_signals(true);
mirror_y->set_block_signals(true);
diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h
index caa9b57c84..eb3205a15c 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.h
+++ b/tools/editor/plugins/tile_map_editor_plugin.h
@@ -111,7 +111,7 @@ protected:
void _node_removed(Node *p_node);
static void _bind_methods();
CellOp _get_op_from_cell(const Point2i& p_pos);
- void _update_transform_buttons(Object *p_button);
+ void _update_transform_buttons(Object *p_button=0);
public:
HBoxContainer *get_canvas_item_editor_hb() const { return canvas_item_editor_hb; }