2.5

******
ported object ops to new naming conventions

3 files changed, 170 insertions, 169 deletions

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 64c78c6b712..5f838c29980 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -584,7 +584,7 @@ void OBJECT_OT_text_add(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int object_add_armature_exec(bContext *C, wmOperator *op)
+static int object_armature_add_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
 	View3D *v3d= CTX_wm_view3d(C);
@@ -622,7 +622,7 @@ void OBJECT_OT_armature_add(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_armature_add";
 	
 	/* api callbacks */
-	ot->exec= object_add_armature_exec;
+	ot->exec= object_armature_add_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -630,7 +630,7 @@ void OBJECT_OT_armature_add(wmOperatorType *ot)
 }
 
 
-static int object_add_primitive_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int object_primitive_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	uiMenuItem *head= uiPupMenuBegin("Add Object", 0);
 	
@@ -660,7 +660,7 @@ void OBJECT_OT_primitive_add(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_primitive_add";
 	
 	/* api callbacks */
-	ot->invoke= object_add_primitive_invoke;
+	ot->invoke= object_primitive_add_invoke;
 	
 	ot->poll= ED_operator_scene_editable;
 	
@@ -710,13 +710,13 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_delete(wmOperatorType *ot)
+void OBJECT_OT_object_delete(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Delete Objects";
 	ot->description = "Delete the object.";
-	ot->idname= "OBJECT_OT_delete";
+	ot->idname= "OBJECT_OT_object_delete";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
@@ -1377,7 +1377,7 @@ static EnumPropertyItem prop_clear_parent_types[] = {
 };
 
 /* note, poll should check for editable scene */
-static int clear_parent_exec(bContext *C, wmOperator *op)
+static int parent_clear_exec(bContext *C, wmOperator *op)
 {
 	
 	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
@@ -1403,16 +1403,16 @@ static int clear_parent_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_parent(wmOperatorType *ot)
+void OBJECT_OT_parent_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear parent";
 	ot->description = "Clear the object's parenting.";
-	ot->idname= "OBJECT_OT_clear_parent";
+	ot->idname= "OBJECT_OT_parent_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= clear_parent_exec;
+	ot->exec= parent_clear_exec;
 	
 	ot->poll= ED_operator_object_active;
 	
@@ -1432,7 +1432,7 @@ static EnumPropertyItem prop_clear_track_types[] = {
 };
 
 /* note, poll should check for editable scene */
-static int object_clear_track_exec(bContext *C, wmOperator *op)
+static int object_track_clear_exec(bContext *C, wmOperator *op)
 {
 	if(CTX_data_edit_object(C)) {
 		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
@@ -1454,16 +1454,16 @@ static int object_clear_track_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_track(wmOperatorType *ot)
+void OBJECT_OT_track_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear track";
 	ot->description = "Clear tracking from object.";
-	ot->idname= "OBJECT_OT_clear_track";
+	ot->idname= "OBJECT_OT_track_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= object_clear_track_exec;
+	ot->exec= object_track_clear_exec;
 	
 	ot->poll= ED_operator_scene_editable;
 	
@@ -1477,7 +1477,7 @@ void OBJECT_OT_clear_track(wmOperatorType *ot)
 /* ***************************** */
 /* ****** Select by Type ****** */
 
-static int object_select_by_type_exec(bContext *C, wmOperator *op)
+static int object_selection_by_type_exec(bContext *C, wmOperator *op)
 {
 	short obtype;
 	
@@ -1495,16 +1495,16 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_select_by_type(wmOperatorType *ot)
+void OBJECT_OT_selection_by_type(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select By Type";
 	ot->description = "Select all visible objects that are of a type.";
-	ot->idname= "OBJECT_OT_select_by_type";
+	ot->idname= "OBJECT_OT_selection_by_type";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= object_select_by_type_exec;
+	ot->exec= object_selection_by_type_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1525,7 +1525,7 @@ static EnumPropertyItem prop_select_linked_types[] = {
 	{0, NULL, NULL, NULL}
 };
 
-static int object_select_linked_exec(bContext *C, wmOperator *op)
+static int object_selection_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob;
@@ -1648,16 +1648,16 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	return OPERATOR_CANCELLED;
 }
 
-void OBJECT_OT_select_linked(wmOperatorType *ot)
+void OBJECT_OT_selection_linked(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select Linked";
 	ot->description = "Select all visible objects that are linked.";
-	ot->idname= "OBJECT_OT_select_linked";
+	ot->idname= "OBJECT_OT_selection_linked";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= object_select_linked_exec;
+	ot->exec= object_selection_linked_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1668,7 +1668,7 @@ void OBJECT_OT_select_linked(wmOperatorType *ot)
 }
 /* ****** selection by layer *******/
 
-static int object_select_by_layer_exec(bContext *C, wmOperator *op)
+static int object_selection_by_layer_exec(bContext *C, wmOperator *op)
 {
 	unsigned int layernum;
 	
@@ -1686,16 +1686,16 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_select_by_layer(wmOperatorType *ot)
+void OBJECT_OT_selection_by_layer(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Selection by layer";
 	ot->description = "Select all visible objects on a layer.";
-	ot->idname= "OBJECT_OT_select_by_layer";
+	ot->idname= "OBJECT_OT_selection_by_layer";
 	
 	/* api callbacks */
 	/*ot->invoke = XXX - need a int grid popup*/
-	ot->exec= object_select_by_layer_exec;
+	ot->exec= object_selection_by_layer_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1705,7 +1705,7 @@ void OBJECT_OT_select_by_layer(wmOperatorType *ot)
 }
 
 /* ****** invert selection *******/
-static int object_select_invert_exec(bContext *C, wmOperator *op)
+static int object_selection_invert_exec(bContext *C, wmOperator *op)
 {
 	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
 		if (base->flag & SELECT)
@@ -1721,16 +1721,16 @@ static int object_select_invert_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_select_invert(wmOperatorType *ot)
+void OBJECT_OT_selection_invert(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Invert selection";
 	ot->description = "Invert th selection of all visible objects.";
-	ot->idname= "OBJECT_OT_select_invert";
+	ot->idname= "OBJECT_OT_selection_invert";
 	
 	/* api callbacks */
-	ot->exec= object_select_invert_exec;
+	ot->exec= object_selection_invert_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1739,7 +1739,7 @@ void OBJECT_OT_select_invert(wmOperatorType *ot)
 }
 /* ****** (de)select All *******/
 
-static int object_de_select_all_exec(bContext *C, wmOperator *op)
+static int object_selection_de_select_all_exec(bContext *C, wmOperator *op)
 {
 	
 	int a=0, ok=0; 
@@ -1767,16 +1767,16 @@ static int object_de_select_all_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_de_select_all(wmOperatorType *ot)
+void OBJECT_OT_selection_de_select_all(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "deselect all";
 	ot->description = "(de)select all visible objects in scene.";
-	ot->idname= "OBJECT_OT_de_select_all";
+	ot->idname= "OBJECT_OT_selection_de_select_all";
 	
 	/* api callbacks */
-	ot->exec= object_de_select_all_exec;
+	ot->exec= object_selection_de_select_all_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1785,7 +1785,7 @@ void OBJECT_OT_de_select_all(wmOperatorType *ot)
 }
 /* ****** random selection *******/
 
-static int object_select_random_exec(bContext *C, wmOperator *op)
+static int object_selection_random_exec(bContext *C, wmOperator *op)
 {	
 	float percent;
 	
@@ -1803,16 +1803,16 @@ static int object_select_random_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_select_random(wmOperatorType *ot)
+void OBJECT_OT_selection_random(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Random selection";
 	ot->description = "Set selection on random visible objects.";
-	ot->idname= "OBJECT_OT_select_random";
+	ot->idname= "OBJECT_OT_selection_random";
 	
 	/* api callbacks */
 	/*ot->invoke= object_select_random_invoke XXX - need a number popup ;*/
-	ot->exec = object_select_random_exec;
+	ot->exec = object_selection_random_exec;
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -1823,7 +1823,7 @@ void OBJECT_OT_select_random(wmOperatorType *ot)
 
 /* ******** Clear object Translation *********** */
 
-static int object_clear_location_exec(bContext *C, wmOperator *op)
+static int object_location_clear_exec(bContext *C, wmOperator *op)
 {
 	int armature_clear= 0;
 
@@ -1849,24 +1849,24 @@ static int object_clear_location_exec(bContext *C, wmOperator *op)
 }
 
 
-void OBJECT_OT_clear_location(wmOperatorType *ot)
+void OBJECT_OT_location_clear(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Clear Object Location";
 	ot->description = "Clear the object's location.";
-	ot->idname= "OBJECT_OT_clear_location";
+	ot->idname= "OBJECT_OT_location_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_location_exec;
+	ot->exec= object_location_clear_exec;
 	ot->poll= ED_operator_object_active;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int object_clear_rotation_exec(bContext *C, wmOperator *op)
+static int object_rotation_clear_exec(bContext *C, wmOperator *op)
 {
 	int armature_clear= 0;
 
@@ -1893,24 +1893,24 @@ static int object_clear_rotation_exec(bContext *C, wmOperator *op)
 }
 
 
-void OBJECT_OT_clear_rotation(wmOperatorType *ot)
+void OBJECT_OT_rotation_clear(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Clear Object Rotation";
 	ot->description = "Clear the object's rotation.";
-	ot->idname= "OBJECT_OT_clear_rotation";
+	ot->idname= "OBJECT_OT_rotation_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_rotation_exec;
+	ot->exec= object_rotation_clear_exec;
 	ot->poll= ED_operator_object_active;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int object_clear_scale_exec(bContext *C, wmOperator *op)
+static int object_scale_clear_exec(bContext *C, wmOperator *op)
 {
 	int armature_clear= 0;
 
@@ -1941,24 +1941,24 @@ static int object_clear_scale_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_scale(wmOperatorType *ot)
+void OBJECT_OT_scale_clear(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Clear Object Scale";
 	ot->description = "Clear the object's scale.";
-	ot->idname= "OBJECT_OT_clear_scale";
+	ot->idname= "OBJECT_OT_scale_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_scale_exec;
+	ot->exec= object_scale_clear_exec;
 	ot->poll= ED_operator_object_active;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int object_clear_origin_exec(bContext *C, wmOperator *op)
+static int object_origin_clear_exec(bContext *C, wmOperator *op)
 {
 	float *v1, *v3, mat[3][3];
 	int armature_clear= 0;
@@ -1987,17 +1987,17 @@ static int object_clear_origin_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_origin(wmOperatorType *ot)
+void OBJECT_OT_origin_clear(wmOperatorType *ot)
 {
 
 	/* identifiers */
 	ot->name= "Clear Object Origin";
-	ot->description = "Clear the object's origion.";
-	ot->idname= "OBJECT_OT_clear_origin";
+	ot->description = "Clear the object's origin.";
+	ot->idname= "OBJECT_OT_origin_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_origin_exec;
+	ot->exec= object_origin_clear_exec;
 	ot->poll= ED_operator_object_active;
 	
 	/* flags */
@@ -2005,7 +2005,7 @@ void OBJECT_OT_clear_origin(wmOperatorType *ot)
 }
 
 /* ********* clear/set restrict view *********/
-static int object_clear_restrictview_exec(bContext *C, wmOperator *op)
+static int object_restrictview_clear_exec(bContext *C, wmOperator *op)
 {
 	ScrArea *sa= CTX_wm_area(C);
 	View3D *v3d= sa->spacedata.first;
@@ -2030,17 +2030,17 @@ static int object_clear_restrictview_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_restrictview(wmOperatorType *ot)
+void OBJECT_OT_restrictview_clear(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Clear restrict view";
 	ot->description = "Clear the object's restrict view flag (reveal the object from hidding).";
-	ot->idname= "OBJECT_OT_clear_restrictview";
+	ot->idname= "OBJECT_OT_restrictview_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_restrictview_exec;
+	ot->exec= object_restrictview_clear_exec;
 	ot->poll= ED_operator_view3d_active;
 	
 	/* flags */
@@ -2053,7 +2053,7 @@ static EnumPropertyItem prop_set_restrictview_types[] = {
 	{0, NULL, NULL, NULL}
 };
 
-static int object_set_restrictview_exec(bContext *C, wmOperator *op)
+static int object_restrictview_set_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	short changed = 0;
@@ -2089,16 +2089,16 @@ static int object_set_restrictview_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_set_restrictview(wmOperatorType *ot)
+void OBJECT_OT_restrictview_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set restrict view";
 	ot->description = "Set the object's restrict view flag (hide the object).";
-	ot->idname= "OBJECT_OT_set_restrictview";
+	ot->idname= "OBJECT_OT_restrictview_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= object_set_restrictview_exec;
+	ot->exec= object_restrictview_set_exec;
 	ot->poll= ED_operator_view3d_active;
 	
 	/* flags */
@@ -2108,7 +2108,7 @@ void OBJECT_OT_set_restrictview(wmOperatorType *ot)
 	
 }
 /* ************* Slow Parent ******************* */
-static int object_set_slowparent_exec(bContext *C, wmOperator *op)
+static int object_slowparent_set_exec(bContext *C, wmOperator *op)
 {
 
 	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
@@ -2126,24 +2126,24 @@ static int object_set_slowparent_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_set_slowparent(wmOperatorType *ot)
+void OBJECT_OT_slowparent_set(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Set Slow Parent";
 	ot->description = "Set the object's slow parent.";
-	ot->idname= "OBJECT_OT_set_slow_parent";
+	ot->idname= "OBJECT_OT_slow_parent_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_set_slowparent_exec;
+	ot->exec= object_slowparent_set_exec;
 	ot->poll= ED_operator_view3d_active;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int object_clear_slowparent_exec(bContext *C, wmOperator *op)
+static int object_slowparent_clear_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 
@@ -2167,17 +2167,17 @@ static int object_clear_slowparent_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_clear_slowparent(wmOperatorType *ot)
+void OBJECT_OT_slowparent_clear(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Clear Slow Parent";
 	ot->description = "Clear the object's slow parent.";
-	ot->idname= "OBJECT_OT_clear_slow_parent";
+	ot->idname= "OBJECT_OT_slow_parent_clear";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_clear_slowparent_exec;
+	ot->exec= object_slowparent_clear_exec;
 	ot->poll= ED_operator_view3d_active;
 	
 	/* flags */
@@ -2445,7 +2445,7 @@ static int test_parent_loop(Object *par, Object *ob)
 }
 
 
-static int make_parent_exec(bContext *C, wmOperator *op)
+static int parent_set_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *par= CTX_data_active_object(C);
@@ -2565,26 +2565,26 @@ static int make_parent_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-static int make_parent_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int parent_set_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	Object *ob= CTX_data_active_object(C);
-	uiMenuItem *head= uiPupMenuBegin("Make Parent To", 0);
+	uiMenuItem *head= uiPupMenuBegin("Set Parent To", 0);
 	
 	uiMenuContext(head, WM_OP_EXEC_DEFAULT);
-	uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_OBJECT);
+	uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_OBJECT);
 	
 	/* ob becomes parent, make the associated menus */
 	if(ob->type==OB_ARMATURE) {
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_ARMATURE);
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_BONE);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_BONE);
 	}
 	else if(ob->type==OB_CURVE) {
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_CURVE);
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_FOLLOW);
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_PATH_CONST);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_CURVE);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_FOLLOW);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_PATH_CONST);
 	}
 	else if(ob->type == OB_LATTICE) {
-		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_LATTICE);
+		uiMenuItemEnumO(head, "", 0, "OBJECT_OT_parent_set", "type", PAR_LATTICE);
 	}
 	
 	uiPupMenuEnd(C, head);
@@ -2593,16 +2593,16 @@ static int make_parent_invoke(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 
-void OBJECT_OT_make_parent(wmOperatorType *ot)
+void OBJECT_OT_parent_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make parent";
 	ot->description = "Set the object's parenting.";
-	ot->idname= "OBJECT_OT_make_parent";
+	ot->idname= "OBJECT_OT_parent_set";
 	
 	/* api callbacks */
-	ot->invoke= make_parent_invoke;
-	ot->exec= make_parent_exec;
+	ot->invoke= parent_set_invoke;
+	ot->exec= parent_set_exec;
 	
 	ot->poll= ED_operator_object_active;
 	
@@ -2620,7 +2620,7 @@ static EnumPropertyItem prop_make_track_types[] = {
 	{0, NULL, NULL, NULL}
 };
 
-static int make_track_exec(bContext *C, wmOperator *op)
+static int track_set_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 		
@@ -2687,16 +2687,16 @@ static int make_track_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_make_track(wmOperatorType *ot)
+void OBJECT_OT_track_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make Track";
 	ot->description = "Nake the object track another object, either by constraint or old way.";
-	ot->idname= "OBJECT_OT_make_track";
+	ot->idname= "OBJECT_OT_track_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= make_track_exec;
+	ot->exec= track_set_exec;
 	
 	ot->poll= ED_operator_scene_editable;
 	
@@ -2750,7 +2750,7 @@ static void make_object_duplilist_real(Scene *scene, View3D *v3d, Base *base)
 }
 
 
-static int object_make_dupli_real_exec(bContext *C, wmOperator *op)
+static int object_dupli_set_real_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	ScrArea *sa= CTX_wm_area(C);
@@ -2770,17 +2770,17 @@ static int object_make_dupli_real_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_make_dupli_real(wmOperatorType *ot)
+void OBJECT_OT_dupli_set_real(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Make Dupli Real";
 	ot->description = "Make dupli objects attached to this object real.";
-	ot->idname= "OBJECT_OT_make_dupli_real";
+	ot->idname= "OBJECT_OT_dupli_set_real";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
-	ot->exec= object_make_dupli_real_exec;
+	ot->exec= object_dupli_set_real_exec;
 	
 	ot->poll= ED_operator_scene_editable;
 	
@@ -2797,7 +2797,7 @@ static EnumPropertyItem prop_set_center_types[] = {
 };
 
 /* 0 == do center, 1 == center new, 2 == center cursor */
-static int object_set_center_exec(bContext *C, wmOperator *op)
+static int object_center_set_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	ScrArea *sa= CTX_wm_area(C);
@@ -3120,15 +3120,16 @@ static int object_set_center_exec(bContext *C, wmOperator *op)
 	
 	return OPERATOR_FINISHED;
 }
-void OBJECT_OT_set_center(wmOperatorType *ot)
+void OBJECT_OT_center_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Center";
-	ot->idname= "OBJECT_OT_set_center";
+	ot->description = "Set the object's center";
+	ot->idname= "OBJECT_OT_center_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
-	ot->exec= object_set_center_exec;
+	ot->exec= object_center_set_exec;
 	
 	ot->poll= ED_operator_view3d_active;
 	
@@ -3311,7 +3312,7 @@ void ED_object_enter_editmode(bContext *C, int flag)
 	if(flag & EM_WAITCURSOR) waitcursor(0);
 }
 
-static int toggle_editmode_exec(bContext *C, wmOperator *op)
+static int editmode_toggle_exec(bContext *C, wmOperator *op)
 {
 	
 	if(!CTX_data_edit_object(C))
@@ -3331,7 +3332,7 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_editmode_toggle";
 	
 	/* api callbacks */
-	ot->exec= toggle_editmode_exec;
+	ot->exec= editmode_toggle_exec;
 	
 	ot->poll= ED_operator_object_active;
 	
@@ -6046,7 +6047,7 @@ Base *ED_object_add_duplicate(Scene *scene, Base *base, int usedupflag)
 }
 
 /* contextual operator dupli */
-static int add_duplicate_exec(bContext *C, wmOperator *op)
+static int duplicate_add_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	View3D *v3d= CTX_wm_view3d(C);
@@ -6078,9 +6079,9 @@ static int add_duplicate_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-static int add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int duplicate_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	add_duplicate_exec(C, op);
+	duplicate_add_exec(C, op);
 	
 	RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
 	WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
@@ -6088,17 +6089,17 @@ static int add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_add_duplicate(wmOperatorType *ot)
+void OBJECT_OT_duplicate_add(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Add Duplicate";
 	ot->description = "Duplicate the object.";
-	ot->idname= "OBJECT_OT_add_duplicate";
+	ot->idname= "OBJECT_OT_duplicate_add";
 	
 	/* api callbacks */
-	ot->invoke= add_duplicate_invoke;
-	ot->exec= add_duplicate_exec;
+	ot->invoke= duplicate_add_invoke;
+	ot->exec= duplicate_add_exec;
 	
 	ot->poll= ED_operator_scene_editable;
 	
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 138f278fe77..81a0317d197 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -43,29 +43,29 @@ struct Mesh;
 
 /* object_edit.c */
 void OBJECT_OT_editmode_toggle(struct wmOperatorType *ot);
-void OBJECT_OT_make_parent(struct wmOperatorType *ot);
-void OBJECT_OT_clear_parent(struct wmOperatorType *ot);
-void OBJECT_OT_make_track(struct wmOperatorType *ot);
-void OBJECT_OT_clear_track(struct wmOperatorType *ot);
-void OBJECT_OT_de_select_all(struct wmOperatorType *ot);
-void OBJECT_OT_select_invert(struct wmOperatorType *ot);
-void OBJECT_OT_select_random(struct wmOperatorType *ot);
-void OBJECT_OT_select_by_type(struct wmOperatorType *ot);
-void OBJECT_OT_select_by_layer(struct wmOperatorType *ot);
-void OBJECT_OT_select_linked(struct wmOperatorType *ot);
-void OBJECT_OT_clear_location(struct wmOperatorType *ot);
-void OBJECT_OT_clear_rotation(struct wmOperatorType *ot);
-void OBJECT_OT_clear_scale(struct wmOperatorType *ot);
-void OBJECT_OT_clear_origin(struct wmOperatorType *ot);
-void OBJECT_OT_clear_restrictview(struct wmOperatorType *ot);
-void OBJECT_OT_set_restrictview(struct wmOperatorType *ot);
-void OBJECT_OT_set_slowparent(struct wmOperatorType *ot);
-void OBJECT_OT_clear_slowparent(struct wmOperatorType *ot);
-void OBJECT_OT_set_center(struct wmOperatorType *ot);
-void OBJECT_OT_make_dupli_real(struct wmOperatorType *ot);
+void OBJECT_OT_parent_set(struct wmOperatorType *ot);
+void OBJECT_OT_parent_clear(struct wmOperatorType *ot);
+void OBJECT_OT_track_set(struct wmOperatorType *ot);
+void OBJECT_OT_track_clear(struct wmOperatorType *ot);
+void OBJECT_OT_selection_de_select_all(struct wmOperatorType *ot);
+void OBJECT_OT_selection_invert(struct wmOperatorType *ot);
+void OBJECT_OT_selection_random(struct wmOperatorType *ot);
+void OBJECT_OT_selection_by_type(struct wmOperatorType *ot);
+void OBJECT_OT_selection_by_layer(struct wmOperatorType *ot);
+void OBJECT_OT_selection_linked(struct wmOperatorType *ot);
+void OBJECT_OT_location_clear(struct wmOperatorType *ot);
+void OBJECT_OT_rotation_clear(struct wmOperatorType *ot);
+void OBJECT_OT_scale_clear(struct wmOperatorType *ot);
+void OBJECT_OT_origin_clear(struct wmOperatorType *ot);
+void OBJECT_OT_restrictview_set(struct wmOperatorType *ot);
+void OBJECT_OT_restrictview_clear(struct wmOperatorType *ot);
+void OBJECT_OT_slowparent_set(struct wmOperatorType *ot);
+void OBJECT_OT_slowparent_clear(struct wmOperatorType *ot);
+void OBJECT_OT_center_set(struct wmOperatorType *ot);
+void OBJECT_OT_dupli_set_real(struct wmOperatorType *ot);
 void OBJECT_OT_object_add(struct wmOperatorType *ot);
-void OBJECT_OT_add_duplicate(struct wmOperatorType *ot);
-void OBJECT_OT_delete(struct wmOperatorType *ot);
+void OBJECT_OT_duplicate_add(struct wmOperatorType *ot);
+void OBJECT_OT_object_delete(struct wmOperatorType *ot);
 
 void OBJECT_OT_mesh_add(struct wmOperatorType *ot);
 void OBJECT_OT_curve_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 134c486bb66..6754ff5b193 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -64,33 +64,33 @@
 void ED_operatortypes_object(void)
 {
 	WM_operatortype_append(OBJECT_OT_editmode_toggle);
-	WM_operatortype_append(OBJECT_OT_make_parent);
-	WM_operatortype_append(OBJECT_OT_clear_parent);
-	WM_operatortype_append(OBJECT_OT_make_track);
-	WM_operatortype_append(OBJECT_OT_clear_track);
-	WM_operatortype_append(OBJECT_OT_select_invert);
-	WM_operatortype_append(OBJECT_OT_select_random);
-	WM_operatortype_append(OBJECT_OT_de_select_all);
-	WM_operatortype_append(OBJECT_OT_select_by_type);
-	WM_operatortype_append(OBJECT_OT_select_by_layer);
-	WM_operatortype_append(OBJECT_OT_select_linked);
-	WM_operatortype_append(OBJECT_OT_clear_location);
-	WM_operatortype_append(OBJECT_OT_clear_rotation);
-	WM_operatortype_append(OBJECT_OT_clear_scale);
-	WM_operatortype_append(OBJECT_OT_clear_origin);
-	WM_operatortype_append(OBJECT_OT_clear_restrictview);
-	WM_operatortype_append(OBJECT_OT_set_restrictview);
-	WM_operatortype_append(OBJECT_OT_set_slowparent);
-	WM_operatortype_append(OBJECT_OT_clear_slowparent);
-	WM_operatortype_append(OBJECT_OT_set_center);
-	WM_operatortype_append(OBJECT_OT_make_dupli_real);
-	WM_operatortype_append(OBJECT_OT_add_duplicate);
+	WM_operatortype_append(OBJECT_OT_parent_set);
+	WM_operatortype_append(OBJECT_OT_parent_clear);
+	WM_operatortype_append(OBJECT_OT_track_set);
+	WM_operatortype_append(OBJECT_OT_track_clear);
+	WM_operatortype_append(OBJECT_OT_selection_invert);
+	WM_operatortype_append(OBJECT_OT_selection_random);
+	WM_operatortype_append(OBJECT_OT_selection_de_select_all);
+	WM_operatortype_append(OBJECT_OT_selection_by_type);
+	WM_operatortype_append(OBJECT_OT_selection_by_layer);
+	WM_operatortype_append(OBJECT_OT_selection_linked);
+	WM_operatortype_append(OBJECT_OT_location_clear);
+	WM_operatortype_append(OBJECT_OT_rotation_clear);
+	WM_operatortype_append(OBJECT_OT_scale_clear);
+	WM_operatortype_append(OBJECT_OT_origin_clear);
+	WM_operatortype_append(OBJECT_OT_restrictview_clear);
+	WM_operatortype_append(OBJECT_OT_restrictview_set);
+	WM_operatortype_append(OBJECT_OT_slowparent_set);
+	WM_operatortype_append(OBJECT_OT_slowparent_clear);
+	WM_operatortype_append(OBJECT_OT_center_set);
+	WM_operatortype_append(OBJECT_OT_dupli_set_real);
+	WM_operatortype_append(OBJECT_OT_duplicate_add);
 	WM_operatortype_append(GROUP_OT_group_create);
 	WM_operatortype_append(GROUP_OT_group_remove);
 	WM_operatortype_append(GROUP_OT_objects_add_active);
 	WM_operatortype_append(GROUP_OT_objects_remove_active);
 
-	WM_operatortype_append(OBJECT_OT_delete);
+	WM_operatortype_append(OBJECT_OT_object_delete);
 	WM_operatortype_append(OBJECT_OT_mesh_add);
 	WM_operatortype_append(OBJECT_OT_curve_add);
 	WM_operatortype_append(OBJECT_OT_text_add);
@@ -106,34 +106,34 @@ void ED_keymap_object(wmWindowManager *wm)
 	
 	/* Note: this keymap works disregarding mode */
 	WM_keymap_add_item(keymap, "OBJECT_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_set_center", CKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_center_set", CKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 
 	/* Note: this keymap gets disabled in non-objectmode,  */
 	keymap= WM_keymap_listbase(wm, "Object Mode", 0, 0);
 	
-	WM_keymap_add_item(keymap, "OBJECT_OT_de_select_all", AKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_select_random", PADASTERKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_select_by_type", PADASTERKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_select_by_layer", PADASTERKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "OBJECT_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_de_select_all", AKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_invert", IKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_random", PADASTERKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_by_type", PADASTERKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_by_layer", PADASTERKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_selection_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
 	
-	WM_keymap_verify_item(keymap, "OBJECT_OT_make_parent", PKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_parent", PKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_make_track", TKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_track", TKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_track_set", TKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_track_set", TKEY, KM_PRESS, KM_ALT, 0);
 	
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_location", GKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_rotation", RKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_scale", SKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_origin", OKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_location_clear", GKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_rotation_clear", RKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_scale_clear", SKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_origin_clear", OKEY, KM_PRESS, KM_ALT, 0);
 	
-	WM_keymap_verify_item(keymap, "OBJECT_OT_clear_restrictview", HKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_set_restrictview", HKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_restrictview_clear", HKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_restrictview_set", HKEY, KM_PRESS, 0, 0);
 	
-	WM_keymap_verify_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_object_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "OBJECT_OT_primitive_add", AKEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_verify_item(keymap, "OBJECT_OT_add_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_verify_item(keymap, "OBJECT_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0);
 	
 	// XXX this should probably be in screen instead... here for testing purposes in the meantime... - Aligorith
 	WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe_old", IKEY, KM_PRESS, 0, 0);