godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16742 from damarindra/fix_crash_edit_mode 

fix crash autotile edit mode
This commit is contained in:
Rémi Verschelde 2018-02-16 12:20:06 +01:00 committed by GitHub
parent 9f590b460e cceb176be3
commit 49dc473ff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -1023,6 +1023,9 @@ void AutotileEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
}
}
} else if (tools[SHAPE_NEW_POLYGON]->is_pressed()) {
if (!tools[TOOL_SELECT]->is_disabled())
tools[TOOL_SELECT]->set_disabled(true);
if (mb.is_valid()) {
if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
Vector2 pos = mb->get_position();
@ -1089,6 +1092,8 @@ void AutotileEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
} else if (mb->is_pressed() && mb->get_button_index() == BUTTON_RIGHT && current_shape.size() > 2) {
if (creating_shape) {
close_shape(shape_anchor);
if (tools[TOOL_SELECT]->is_disabled())
tools[TOOL_SELECT]->set_disabled(false);
}
}
} else if (mm.is_valid()) {