diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_group.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 198838d6f05..ec8409e9aa1 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -198,11 +198,11 @@ static int group_create_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); Group *group= NULL; - char gid[32]; //group id + char name[32]; /* id name */ - RNA_string_get(op->ptr, "GID", gid); + RNA_string_get(op->ptr, "name", name); - group= add_group(gid); + group= add_group(name); CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) { add_to_group(group, base->object); @@ -218,12 +218,12 @@ static int group_create_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void GROUP_OT_group_create(wmOperatorType *ot) +void GROUP_OT_create(wmOperatorType *ot) { /* identifiers */ ot->name= "Create New Group"; - ot->description = "Create an object group."; - ot->idname= "GROUP_OT_group_create"; + ot->description = "Create an object group from selected objects."; + ot->idname= "GROUP_OT_create"; /* api callbacks */ ot->exec= group_create_exec; @@ -232,7 +232,7 @@ void GROUP_OT_group_create(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "GID", "Group", 32, "Name", "Name of the new group"); + RNA_def_string(ot->srna, "name", "Group", 32, "Name", "Name of the new group"); } /****************** properties window operators *********************/ diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 9ce54241cb6..ebc36dddb33 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -114,7 +114,7 @@ void LATTICE_OT_select_all_toggle(struct wmOperatorType *ot); void LATTICE_OT_make_regular(struct wmOperatorType *ot); /* object_group.c */ -void GROUP_OT_group_create(struct wmOperatorType *ot); +void GROUP_OT_create(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 85211f12a0c..fc06a94ecfa 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -104,7 +104,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_select_mirror); WM_operatortype_append(OBJECT_OT_select_name); /* XXX - weak, not compat with linked objects */ - WM_operatortype_append(GROUP_OT_group_create); + WM_operatortype_append(GROUP_OT_create); WM_operatortype_append(GROUP_OT_objects_remove); WM_operatortype_append(GROUP_OT_objects_add_active); WM_operatortype_append(GROUP_OT_objects_remove_active); @@ -294,7 +294,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe_menu", IKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe_v3d", 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_create", GKEY, KM_PRESS, KM_CTRL, 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); |