From 29eb8916587be9bc58418937e86802b3d4eca4a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Apr 2020 17:33:24 +1100 Subject: Fix curve shortest path picking with right-click select --- release/scripts/presets/keyconfig/keymap_data/blender_default.py | 2 +- source/blender/editors/curve/editcurve_select.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 971c702aeac..7ee42fc4dc4 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -4043,7 +4043,7 @@ def km_curve(params): {"properties": [("deselect", False)]}), ("curve.select_linked_pick", {"type": 'L', "value": 'PRESS', "shift": True}, {"properties": [("deselect", True)]}), - ("curve.shortest_path_pick", {"type": params.select_mouse, "value": 'CLICK', "ctrl": True}, None), + ("curve.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, None), ("curve.separate", {"type": 'P', "value": 'PRESS'}, None), ("curve.split", {"type": 'Y', "value": 'PRESS'}, None), ("curve.extrude_move", {"type": 'E', "value": 'PRESS'}, None), diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c index 51bb1eafdb9..e590eb64f84 100644 --- a/source/blender/editors/curve/editcurve_select.c +++ b/source/blender/editors/curve/editcurve_select.c @@ -1825,7 +1825,7 @@ static float curve_calc_dist_span(Nurb *nu, int vert_src, int vert_dst) int i_prev, i; float dist = 0.0f; - BLI_assert(nu->pntsv == 1); + BLI_assert(nu->pntsv <= 1); i_prev = vert_src; i = (i_prev + 1) % u; -- cgit v1.2.3