diff options
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/editgroup.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/object/editgroup.c b/source/blender/editors/object/editgroup.c index 17542cc4817..b49e2040b03 100644 --- a/source/blender/editors/object/editgroup.c +++ b/source/blender/editors/object/editgroup.c @@ -196,13 +196,13 @@ static int group_remove_exec(bContext *C, wmOperator *op) } -void GROUP_OT_group_remove(wmOperatorType *ot) +void GROUP_OT_objects_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "remove Selected from group"; - ot->description = "remove an object from the group."; - ot->idname= "GROUP_OT_group_remove"; + ot->name= "Remove from group"; + ot->description = "Remove selected objects from all groups."; + ot->idname= "GROUP_OT_objects_remove"; /* api callbacks */ ot->exec= group_remove_exec; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 57fc49f7304..29e3d880c16 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -710,13 +710,13 @@ static int object_delete_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_object_delete(wmOperatorType *ot) +void OBJECT_OT_delete(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Objects"; ot->description = "Delete the object."; - ot->idname= "OBJECT_OT_object_delete"; + ot->idname= "OBJECT_OT_delete"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -1767,13 +1767,13 @@ static int object_select_de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_select_de_select_all(wmOperatorType *ot) +void OBJECT_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "deselect all"; ot->description = "(de)select all visible objects in scene."; - ot->idname= "OBJECT_OT_select_de_select_all"; + ot->idname= "OBJECT_OT_select_all_toggle"; /* api callbacks */ ot->exec= object_select_de_select_all_exec; diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index a5d509b80d7..1c56b0c7115 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -44,7 +44,7 @@ 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_select_de_select_all(struct wmOperatorType *ot); +void OBJECT_OT_select_all_toggle(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); @@ -62,7 +62,7 @@ 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_duplicate_add(struct wmOperatorType *ot); -void OBJECT_OT_object_delete(struct wmOperatorType *ot); +void OBJECT_OT_delete(struct wmOperatorType *ot); void OBJECT_OT_mesh_add(struct wmOperatorType *ot); void OBJECT_OT_curve_add(struct wmOperatorType *ot); @@ -80,7 +80,7 @@ void remake_editLatt(Object *obedit); /* editgroup.c */ void GROUP_OT_group_create(struct wmOperatorType *ot); -void GROUP_OT_group_remove(struct wmOperatorType *ot); +void GROUP_OT_objects_remove(struct wmOperatorType *ot); void GROUP_OT_objects_add_active(struct wmOperatorType *ot); void GROUP_OT_objects_remove_active(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 2c922f80887..8cbf9bf5287 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -70,7 +70,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_track_clear); WM_operatortype_append(OBJECT_OT_select_invert); WM_operatortype_append(OBJECT_OT_select_random); - WM_operatortype_append(OBJECT_OT_select_de_select_all); + WM_operatortype_append(OBJECT_OT_select_all_toggle); WM_operatortype_append(OBJECT_OT_select_by_type); WM_operatortype_append(OBJECT_OT_select_by_layer); WM_operatortype_append(OBJECT_OT_select_linked); @@ -86,11 +86,11 @@ void ED_operatortypes_object(void) 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_remove); WM_operatortype_append(GROUP_OT_objects_add_active); WM_operatortype_append(GROUP_OT_objects_remove_active); - WM_operatortype_append(OBJECT_OT_object_delete); + WM_operatortype_append(OBJECT_OT_delete); WM_operatortype_append(OBJECT_OT_mesh_add); WM_operatortype_append(OBJECT_OT_curve_add); WM_operatortype_append(OBJECT_OT_text_add); @@ -111,7 +111,7 @@ void ED_keymap_object(wmWindowManager *wm) /* Note: this keymap gets disabled in non-objectmode, */ keymap= WM_keymap_listbase(wm, "Object Mode", 0, 0); - WM_keymap_add_item(keymap, "OBJECT_OT_select_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_select_all_toggle", 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); @@ -131,7 +131,7 @@ void ED_keymap_object(wmWindowManager *wm) 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_object_delete", XKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "OBJECT_OT_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_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0); @@ -140,7 +140,7 @@ void ED_keymap_object(wmWindowManager *wm) WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe_old", IKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_group_create", GKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_verify_item(keymap, "GROUP_OT_group_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); + WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); |