diff options
| author | Zaven Muradyan <voithos@google.com> | 2017-05-27 17:56:20 -0700 |
|---|---|---|
| committer | Zaven Muradyan <voithos@google.com> | 2017-05-27 18:47:45 -0700 |
| commit | f460f82ec1dc6df21be181308d06ee83306eaed7 (patch) | |
| tree | 740cea3f78f06ea542a11a24a0bc90e73e51f0e5 /editor | |
| parent | 1525071c28535816b98784f2ad62f9d5ef333654 (diff) | |
Fix moving path controls in edit mode.
The previous code would never trigger the subsequent conditionals (for
moving the control points) when in EDIT_MODE because the point
conditionals were nested instead of being a conjunction.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/path_2d_editor_plugin.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index f8d250334c..73d5b28886 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -94,16 +94,14 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) { // Check for point movement start (for point + in/out controls). if (mb->get_button_index() == BUTTON_LEFT) { - if (!mb->get_shift() && mode == MODE_EDIT) { - // Point can only be moved in edit mode. - if (dist_to_p < grab_threshold) { + if (mode == MODE_EDIT && !mb->get_shift() && dist_to_p < grab_threshold) { + // Points can only be moved in edit mode. - action = ACTION_MOVING_POINT; - action_point = i; - moving_from = curve->get_point_pos(i); - moving_screen_from = gpoint; - return true; - } + action = ACTION_MOVING_POINT; + action_point = i; + moving_from = curve->get_point_pos(i); + moving_screen_from = gpoint; + return true; } else if (mode == MODE_EDIT || mode == MODE_EDIT_CURVE) { // In/out controls can be moved in multiple modes. if (dist_to_p_out < grab_threshold && i < (curve->get_point_count() - 1)) { |