Revision: 18669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18669
Author: campbellbarton
Date: 2009-01-25 16:41:17 +0100 (Sun, 25 Jan 2009)
Log Message:
-----------
make operator names more consistent
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-
?\239?\187?\191VIEW3D_OT_vpaint_toggle and
?\239?\187?\191VIEW3D_OT_wpaint_toggle.
'invert' was used everywhere else.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -341,11 +341,11 @@
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 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 @@
/* 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);
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -2995,12 +2995,12 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2009-01-25 15:41:17 UTC (rev 18669)
@@ -42,7 +42,7 @@
#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);
Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -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 @@
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, */
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -1664,11 +1664,11 @@
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 @@
{
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)
Modified:
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
2009-01-25 15:30:43 UTC (rev 18668)
+++
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -244,7 +244,7 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2009-01-25 15:41:17 UTC (rev 18669)
@@ -56,7 +56,7 @@
/* 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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -52,7 +52,7 @@
{
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 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
2009-01-25 15:30:43 UTC (rev 18668)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -179,11 +179,11 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-01-25 15:30:43 UTC (rev 18668)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -5356,7 +5356,7 @@
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) {
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
2009-01-25 15:30:43 UTC (rev 18668)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
2009-01-25 15:41:17 UTC (rev 18669)
@@ -4074,7 +4074,7 @@
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;
Modified: branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
