[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25891] trunk/blender/source/blender/ editors: * Restored vertex parent

Matt Ebb matt at mke3.net
Mon Jan 11 06:55:35 CET 2010


Revision: 25891
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25891
Author:   broken
Date:     2010-01-11 06:55:34 +0100 (Mon, 11 Jan 2010)

Log Message:
-----------
* Restored vertex parent 
The operator was already there and written, just didn't have a hotkey 
assigned. Gave it an icky popup menu like object mode parent until we 
get a nice non-blocking report viewer.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/curve_ops.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c
    trunk/blender/source/blender/editors/object/object_ops.c
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c	2010-01-11 05:32:01 UTC (rev 25890)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c	2010-01-11 05:55:34 UTC (rev 25891)
@@ -218,6 +218,8 @@
 	WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0)->ptr, "unselected", 1);
 
+	WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
+	
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_curve_specials", WKEY, KM_PRESS, 0, 0);
 
 	/* menus */

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2010-01-11 05:32:01 UTC (rev 25890)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-01-11 05:55:34 UTC (rev 25891)
@@ -4182,12 +4182,6 @@
 {
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
-	Nurb *nu;
-	BezTriple *bezt;
-	BPoint *bp;
-	int amounttoselect, amountofcps, a, i, k= 0;
-	int *itemstobeselected;
-	float percent;
 
 	if(!RNA_boolean_get(op->ptr, "extend"))
 		CU_deselect_all(obedit);

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2010-01-11 05:32:01 UTC (rev 25890)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2010-01-11 05:55:34 UTC (rev 25891)
@@ -287,6 +287,8 @@
 	WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
 	
 	WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, 0, KKEY);
+	
+	WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
 
 	/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_specials", WKEY, KM_PRESS, 0, 0);

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2010-01-11 05:32:01 UTC (rev 25890)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2010-01-11 05:55:34 UTC (rev 25891)
@@ -330,6 +330,8 @@
 
 	WM_keymap_add_item(keymap, "LATTICE_OT_select_all", AKEY, KM_PRESS, 0, 0);
 	
+	WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
+	
 		/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
 

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2010-01-11 05:32:01 UTC (rev 25890)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2010-01-11 05:55:34 UTC (rev 25891)
@@ -251,6 +251,7 @@
 	ot->idname= "OBJECT_OT_vertex_parent_set";
 	
 	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
 	ot->poll= vertex_parent_set_poll;
 	ot->exec= vertex_parent_set_exec;
 	





More information about the Bf-blender-cvs mailing list