griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make operator names more consistent

Browse Source 
ANIM_OT_toggle_time -> ANIM_OT_time_toggle
SCULPT_OT_toggle_mode -> SCULPT_OT_sculptmode_toggle
UV_OT_select_inverse -> UV_OT_select_invert
NODE_OT_toggle_visibility -> NODE_OT_visibility_toggle
OBJECT_OT_toggle_editmode -> OBJECT_OT_editmode_toggle

toggle was used last in other operators eg- VIEW3D_OT_vpaint_toggle and VIEW3D_OT_wpaint_toggle.

'invert' was used everywhere else.
This commit is contained in:
Campbell Barton
2009-01-25 15:41:17 +00:00
parent 31fc0ff995
commit 8b793524ff
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/animation/anim_ops.c
View File

@@ -341,11 +341,11 @@ static int toggle_time_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void ANIM_OT_toggle_time(wmOperatorType *ot)
void ANIM_OT_time_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Frames/Seconds";
ot->idname= "ANIM_OT_toggle_time";
ot->idname= "ANIM_OT_time_toggle";
/* api callbacks */
ot->exec= toggle_time_exec;
@@ -356,7 +356,7 @@ void ANIM_OT_toggle_time(wmOperatorType *ot)
void ED_operatortypes_anim(void)
{
WM_operatortype_append(ANIM_OT_change_frame);
WM_operatortype_append(ANIM_OT_toggle_time);
WM_operatortype_append(ANIM_OT_time_toggle);
WM_operatortype_append(ANIM_OT_previewrange_define);
WM_operatortype_append(ANIM_OT_previewrange_clear);
@@ -372,7 +372,7 @@ void ED_keymap_anim(wmWindowManager *wm)
/* frame management */
WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "ANIM_OT_toggle_time", TKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_verify_item(keymap, "ANIM_OT_time_toggle", TKEY, KM_PRESS, KM_CTRL, 0);
/* preview range */
WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_define", PKEY, KM_PRESS, KM_CTRL, 0);

4
source/blender/editors/object/object_edit.c
View File

@@ -2995,12 +2995,12 @@ static int toggle_editmode_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void OBJECT_OT_toggle_editmode(wmOperatorType *ot)
void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Editmode";
ot->idname= "OBJECT_OT_toggle_editmode";
ot->idname= "OBJECT_OT_editmode_toggle";
/* api callbacks */
ot->exec= toggle_editmode_exec;

2
source/blender/editors/object/object_intern.h
View File

@@ -42,7 +42,7 @@ struct Mesh;
#define CLEAR_OBJ_ORIGIN 3
/* object_edit.c */
void OBJECT_OT_toggle_editmode(struct wmOperatorType *ot);
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);

4
source/blender/editors/object/object_ops.c
View File

@@ -63,7 +63,7 @@
void ED_operatortypes_object(void)
{
WM_operatortype_append(OBJECT_OT_toggle_editmode);
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);
@@ -97,7 +97,7 @@ void ED_keymap_object(wmWindowManager *wm)
ListBase *keymap= WM_keymap_listbase(wm, "Object Non-modal", 0, 0);
/* Note: this keymap works disregarding mode */
WM_keymap_add_item(keymap, "OBJECT_OT_toggle_editmode", TABKEY, KM_PRESS, 0, 0);
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);
/* Note: this keymap gets disabled in non-objectmode, */

6
source/blender/editors/sculpt/sculpt.c
View File

@@ -1664,11 +1664,11 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
static void SCULPT_OT_toggle_mode(wmOperatorType *ot)
static void SCULPT_OT_sculptmode_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Sculpt Mode";
ot->idname= "SCULPT_OT_toggle_mode";
ot->idname= "SCULPT_OT_sculptmode_toggle";
/* api callbacks */
ot->exec= sculpt_toggle_mode;
@@ -1680,7 +1680,7 @@ void ED_operatortypes_sculpt()
{
WM_operatortype_append(SCULPT_OT_radial_control);
WM_operatortype_append(SCULPT_OT_brush_stroke);
WM_operatortype_append(SCULPT_OT_toggle_mode);
WM_operatortype_append(SCULPT_OT_sculptmode_toggle);
}
void sculpt(Sculpt *sd)

2
source/blender/editors/space_image/image_header.c
View File

@@ -244,7 +244,7 @@ static uiBlock *image_selectmenu(bContext *C, uiMenuBlockHandle *handle, void *a
uiDefMenuSep(block);
uiDefMenuButO(block, "UV_OT_de_select_all", NULL);
uiDefMenuButO(block, "UV_OT_select_inverse", NULL);
uiDefMenuButO(block, "UV_OT_select_invert", NULL);
uiDefMenuButO(block, "UV_OT_unlink_selection", NULL); // Unlink Selection|Alt L
uiDefMenuSep(block);

2
source/blender/editors/space_node/node_intern.h
View File

@@ -56,7 +56,7 @@ void node_keymap(wmWindowManager *wm);
/* node_select.c */
void NODE_OT_select(struct wmOperatorType *ot);
void NODE_OT_extend_select(struct wmOperatorType *ot);
void NODE_OT_toggle_visibility(struct wmOperatorType *ot);
void NODE_OT_visibility_toggle(struct wmOperatorType *ot);
void NODE_OT_fit_all(struct wmOperatorType *ot);
void NODE_OT_border_select(struct wmOperatorType *ot);
void NODE_OT_delete_selection(struct wmOperatorType *ot);

4
source/blender/editors/space_node/node_ops.c
View File

@@ -52,7 +52,7 @@ void node_operatortypes(void)
{
WM_operatortype_append(NODE_OT_select);
WM_operatortype_append(NODE_OT_extend_select);
WM_operatortype_append(NODE_OT_toggle_visibility);
WM_operatortype_append(NODE_OT_visibility_toggle);
WM_operatortype_append(NODE_OT_fit_all);
WM_operatortype_append(NODE_OT_border_select);
WM_operatortype_append(NODE_OT_delete_selection);
@@ -64,7 +64,7 @@ void node_keymap(struct wmWindowManager *wm)
RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", SELECTMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_extend_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
WM_keymap_add_item(keymap, "NODE_OT_toggle_visibility", ACTIONMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", ACTIONMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_fit_all", HOMEKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_border_select", BKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_delete_selection", XKEY, KM_PRESS, 0, 0);

4
source/blender/editors/space_node/node_state.c
View File

@@ -179,11 +179,11 @@ static int node_toggle_visibility_invoke(bContext *C, wmOperator *op, wmEvent *e
return node_toggle_visibility_exec(C,op);
}
void NODE_OT_toggle_visibility(wmOperatorType *ot)
void NODE_OT_visibility_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Visibility";
ot->idname= "NODE_OT_toggle_visibility";
ot->idname= "NODE_OT_visibility_toggle";
/* api callbacks */
ot->invoke= node_toggle_visibility_invoke;

2
source/blender/editors/space_view3d/view3d_header.c
View File

@@ -5356,7 +5356,7 @@ static void do_view3d_buttons(bContext *C, void *arg, int event)
ED_view3d_exit_paint_modes(C);
if(obedit) ED_object_exit_editmode(C, EM_FREEUNDO|EM_FREEUNDO|EM_WAITCURSOR); /* exit editmode and undo */
WM_operator_name_call(C, "SCULPT_OT_toggle_mode", WM_OP_EXEC_REGION_WIN, NULL);
WM_operator_name_call(C, "SCULPT_OT_sculptmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
}
}
else if (v3d->modeselect == V3D_VERTEXPAINTMODE_SEL) {

2
source/blender/editors/transform/transform_conversions.c
View File

@@ -4074,7 +4074,7 @@ void special_aftertrans_update(TransInfo *t)
if (!cancelled) {
ListBase *seqbasep= ((Editing *)t->scene->ed)->seqbasep;
int a, new_frame;
int a;
TransData *td= t->data;
TransData2D *td2d= t->data2d;
TransDataSeq *tdsq= NULL;

8
source/blender/editors/uvedit/uvedit_ops.c
View File

@@ -1385,11 +1385,11 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void UV_OT_select_inverse(wmOperatorType *ot)
void UV_OT_select_invert(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Invert";
ot->idname= "UV_OT_select_inverse";
ot->idname= "UV_OT_select_invert";
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* api callbacks */
@@ -2575,7 +2575,7 @@ void select_pinned_tface_uv(Scene *scene, Image *ima, Object *obedit)
void ED_operatortypes_uvedit(void)
{
WM_operatortype_append(UV_OT_de_select_all);
WM_operatortype_append(UV_OT_select_inverse);
WM_operatortype_append(UV_OT_select_invert);
WM_operatortype_append(UV_OT_select);
WM_operatortype_append(UV_OT_loop_select);
WM_operatortype_append(UV_OT_select_linked);
@@ -2600,7 +2600,7 @@ void ED_keymap_uvedit(wmWindowManager *wm)
WM_keymap_add_item(keymap, "UV_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_unlink_selection", LKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "UV_OT_de_select_all", AKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "UV_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_stitch", VKEY, KM_PRESS, 0, 0);
}