diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 11:39:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 11:39:47 +0200 |
| commit | 2b50dc5d4f0b9d0c6fd5463b5d89d17578b388ab (patch) | |
| tree | c3bd911221cb9e3850f28bf5e5c605fcbad1089e /editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | d455b13fcf7ff7ce5d62c08d97e035cf27805be5 (diff) | |
| parent | 67a706fc1b9721f3f06eef8be7312f175e2041ce (diff) | |
| download | redot-engine-2b50dc5d4f0b9d0c6fd5463b5d89d17578b388ab.tar.gz | |
Merge pull request #11057 from hpvb/fix-various-warnings
Fix various assorted warnings
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index c0a6606ea7..d0bd18aa88 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1515,7 +1515,7 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) { } if (drag == DRAG_NONE) { - if ((m->get_button_mask() & BUTTON_MASK_LEFT && tool == TOOL_PAN) || m->get_button_mask() & BUTTON_MASK_MIDDLE || (m->get_button_mask() & BUTTON_MASK_LEFT && Input::get_singleton()->is_key_pressed(KEY_SPACE))) { + if (((m->get_button_mask() & BUTTON_MASK_LEFT) && tool == TOOL_PAN) || (m->get_button_mask() & BUTTON_MASK_MIDDLE) || ((m->get_button_mask() & BUTTON_MASK_LEFT) && Input::get_singleton()->is_key_pressed(KEY_SPACE))) { // Pan the viewport Point2i relative; if (bool(EditorSettings::get_singleton()->get("editors/2d/warped_mouse_panning"))) { |