diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-27 16:48:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 16:48:09 +0200 |
| commit | 4cf5bb027678717263476e676cd23f881eef1ca1 (patch) | |
| tree | a842d54e82a4998c8b593f86fef858560c10b4d2 /modules/gridmap/grid_map_editor_plugin.cpp | |
| parent | cb5a62903f9798da8b12f625cbd5a493f14e41d3 (diff) | |
| parent | cdc411fd54fbafc414b29abb1d50a0ff327f0d89 (diff) | |
| download | redot-engine-4cf5bb027678717263476e676cd23f881eef1ca1.tar.gz | |
Merge pull request #22446 from akien-mga/fix-warnings
Fix various warnings raised by GCC 5
Diffstat (limited to 'modules/gridmap/grid_map_editor_plugin.cpp')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 5fdb6a5196..fae88042af 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -597,29 +597,31 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu if (mb->get_button_index() == BUTTON_LEFT) { if (input_action == INPUT_DUPLICATE) { - //paste _duplicate_paste(); input_action = INPUT_NONE; _update_duplicate_indicator(); } else if (mb->get_shift()) { input_action = INPUT_SELECT; - } else if (mb->get_command()) + } else if (mb->get_command()) { input_action = INPUT_COPY; - else { + } else { input_action = INPUT_PAINT; set_items.clear(); } - } else if (mb->get_button_index() == BUTTON_RIGHT) + } else if (mb->get_button_index() == BUTTON_RIGHT) { if (input_action == INPUT_DUPLICATE) { - input_action = INPUT_NONE; _update_duplicate_indicator(); } else if (mb->get_shift()) { input_action = INPUT_ERASE; set_items.clear(); - } else + } else { return false; + } + } else { + return false; + } return do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true); } else { |