[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33578] trunk/blender/source/blender/ editors/curve: Related to previous commit:

[Ton Roosendaal]

Revision: 33578
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33578
Author:   ton
Date:     2010-12-09 20:06:45 +0100 (Thu, 09 Dec 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/curve_ops.c
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c	2010-12-09 18:31:40 UTC (rev 33577)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c	2010-12-09 19:06:45 UTC (rev 33578)
@@ -195,7 +195,12 @@
 	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);

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2010-12-09 18:31:40 UTC (rev 33577)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-12-09 19:06:45 UTC (rev 33578)
@@ -3537,11 +3537,11 @@
 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 */