From 3ee53d7b5f8e4371607467cff69c3f35662abdc4 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 9 Dec 2010 19:06:45 +0000 Subject: Related to previous commit: I still have to learn more of the recent changes in code :) Didn't know the handle type options became a menu for Curve edit mode. Providing much-used tools non-modal (direct) really should have preference. Pull down is not very accessible here though, will check on it later. :) This restores H, Shift+H, V and alt+H for handle setting. --- source/blender/editors/curve/curve_ops.c | 7 ++++++- source/blender/editors/curve/editcurve.c | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 66d8787627f..9f67b9d6c06 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -195,7 +195,12 @@ void ED_keymap_curve(wmKeyConfig *keyconf) keymap->poll= ED_operator_editsurfcurve; WM_keymap_add_menu(keymap, "INFO_MT_edit_curve_add", AKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_menu(keymap, "INFO_MT_curve_handle_type_set", VKEY, KM_PRESS, 0, 0); + /* XXX will fix it with proper defines (ton) */ + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, 0, 0)->ptr, "type", 5); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", HD_AUTO); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, KM_ALT, 0)->ptr, "type", 6); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", VKEY, KM_PRESS, 0, 0)->ptr, "type", HD_VECT); + WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", LEFTMOUSE, KM_CLICK, KM_CTRL, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 1a700868a96..9086e9fb317 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -3537,11 +3537,11 @@ static int set_handle_type_exec(bContext *C, wmOperator *op) void CURVE_OT_handle_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {1, "AUTOMATIC", 0, "Automatic", ""}, - {2, "VECTOR", 0, "Vector", ""}, - {3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""}, + {HD_AUTO, "AUTOMATIC", 0, "Automatic", ""}, + {HD_VECT, "VECTOR", 0, "Vector", ""}, {5, "ALIGN", 0, "Align", ""}, {6, "FREE_ALIGN", 0, "Free Align", ""}, + {3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ -- cgit v1.2.3