Revision: 21676
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21676
Author: theeth
Date: 2009-07-18 16:55:03 +0200 (Sat, 18 Jul 2009)
Log Message:
-----------
Use verb for operator names
Translation -> Translate
Rotation -> Rotate
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
2009-07-18 13:29:47 UTC (rev 21675)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
2009-07-18 14:55:03 UTC (rev 21676)
@@ -719,7 +719,7 @@
RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
- WM_operator_name_call(C, "TFM_OT_translation", WM_OP_INVOKE_REGION_WIN,
op->ptr);
+ WM_operator_name_call(C, "TFM_OT_translate", WM_OP_INVOKE_REGION_WIN,
op->ptr);
return OPERATOR_FINISHED;
}
@@ -4991,7 +4991,7 @@
RNA_enum_set(op->ptr, "proportional", 0);
RNA_boolean_set(op->ptr, "mirror", 0);
- WM_operator_name_call(C, "TFM_OT_translation", WM_OP_INVOKE_REGION_WIN,
op->ptr);
+ WM_operator_name_call(C, "TFM_OT_translate", WM_OP_INVOKE_REGION_WIN,
op->ptr);
return OPERATOR_FINISHED;
}
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
2009-07-18 13:29:47 UTC (rev 21675)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
2009-07-18 14:55:03 UTC (rev 21676)
@@ -1601,7 +1601,7 @@
break;
}
RNA_boolean_set_array(op->ptr, "constraint_axis",
constraint_axis);
- WM_operator_name_call(C, "TFM_OT_translation",
WM_OP_INVOKE_REGION_WIN, op->ptr);
+ WM_operator_name_call(C, "TFM_OT_translate",
WM_OP_INVOKE_REGION_WIN, op->ptr);
}
else if (drawflags & MAN_SCALE_C) {
switch(drawflags) {
@@ -1649,7 +1649,7 @@
break;
}
RNA_boolean_set_array(op->ptr, "constraint_axis",
constraint_axis);
- WM_operator_name_call(C, "TFM_OT_rotation",
WM_OP_INVOKE_REGION_WIN, op->ptr);
+ WM_operator_name_call(C, "TFM_OT_rotate",
WM_OP_INVOKE_REGION_WIN, op->ptr);
}
}
/* after transform, restore drawflags */
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
2009-07-18 13:29:47 UTC (rev 21675)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
2009-07-18 14:55:03 UTC (rev 21676)
@@ -88,8 +88,8 @@
{V3D_MANIP_VIEW, "VIEW", 0, "View", ""},
{0, NULL, 0, NULL, NULL}};
-char OP_TRANSLATION[] = "TFM_OT_translation";
-char OP_ROTATION[] = "TFM_OT_rotation";
+char OP_TRANSLATION[] = "TFM_OT_translate";
+char OP_ROTATION[] = "TFM_OT_rotate";
char OP_TOSPHERE[] = "TFM_OT_tosphere";
char OP_RESIZE[] = "TFM_OT_resize";
char OP_SHEAR[] = "TFM_OT_shear";
@@ -301,10 +301,10 @@
RNA_def_enum_funcs(prop, select_orientation_itemf);
}
-void TFM_OT_translation(struct wmOperatorType *ot)
+void TFM_OT_translate(struct wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Translation";
+ ot->name = "Translate";
ot->idname = OP_TRANSLATION;
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
@@ -373,10 +373,10 @@
RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
}
-void TFM_OT_rotation(struct wmOperatorType *ot)
+void TFM_OT_rotate(struct wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Rotation";
+ ot->name = "Rotate";
ot->idname = OP_ROTATION;
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
@@ -568,8 +568,8 @@
void transform_operatortypes(void)
{
WM_operatortype_append(TFM_OT_transform);
- WM_operatortype_append(TFM_OT_translation);
- WM_operatortype_append(TFM_OT_rotation);
+ WM_operatortype_append(TFM_OT_translate);
+ WM_operatortype_append(TFM_OT_rotate);
WM_operatortype_append(TFM_OT_tosphere);
WM_operatortype_append(TFM_OT_resize);
WM_operatortype_append(TFM_OT_shear);
@@ -587,11 +587,11 @@
switch(spaceid)
{
case SPACE_VIEW3D:
- km = WM_keymap_add_item(keymap, "TFM_OT_translation",
GKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_translate",
GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_S, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_rotation",
RKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotate", RKEY,
KM_PRESS, 0, 0);
km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY,
KM_PRESS, 0, 0);
@@ -625,15 +625,15 @@
RNA_int_set(km->ptr, "mode", TFM_TIME_SLIDE);
break;
case SPACE_IPO:
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
GKEY, KM_PRESS, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_S, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_S, KM_ANY, 0, 0);
// XXX the 'mode' identifier here is not quite
right
km= WM_keymap_add_item(keymap, "TFM_OT_transform",
EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
- km = WM_keymap_add_item(keymap, "TFM_OT_rotation",
RKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotate", RKEY,
KM_PRESS, 0, 0);
km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY,
KM_PRESS, 0, 0);
break;
@@ -651,29 +651,29 @@
RNA_int_set(km->ptr, "mode", TFM_TIME_SCALE);
break;
case SPACE_NODE:
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
GKEY, KM_PRESS, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_A, KM_ANY, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_S, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_A, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_rotation",
RKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotate", RKEY,
KM_PRESS, 0, 0);
km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY,
KM_PRESS, 0, 0);
break;
case SPACE_SEQ:
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
GKEY, KM_PRESS, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_S, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_S, KM_ANY, 0, 0);
km= WM_keymap_add_item(keymap, "TFM_OT_transform",
EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
break;
case SPACE_IMAGE:
- km = WM_keymap_add_item(keymap, "TFM_OT_translation",
GKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_translate",
GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_translation",
EVT_TWEAK_S, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translate",
EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_rotation",
RKEY, KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotate", RKEY,
KM_PRESS, 0, 0);
km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY,
KM_PRESS, 0, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
