Revision: 18072
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18072
Author: aligorith
Date: 2008-12-26 12:33:41 +0100 (Fri, 26 Dec 2008)
Log Message:
-----------
2.5 -
Renaming operators to follow new naming convention set out by Ton
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_intern.h
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2008-12-26 11:32:20 UTC (rev 18071)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2008-12-26 11:33:41 UTC (rev 18072)
@@ -206,11 +206,11 @@
return OPERATOR_FINISHED;
}
-static void ED_MARKER_OT_add(wmOperatorType *ot)
+static void MARKER_OT_add(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Time Marker";
- ot->idname= "ED_MARKER_OT_add";
+ ot->idname= "MARKER_OT_add";
/* api callbacks */
ot->exec= ed_marker_add;
@@ -471,14 +471,14 @@
ed_marker_move_exit(C, op);
return OPERATOR_FINISHED;
}
- return OPERATOR_CANCELLED;
+ return OPERATOR_PASS_THROUGH;
}
-static void ED_MARKER_OT_move(wmOperatorType *ot)
+static void MARKER_OT_move(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Move Time Marker";
- ot->idname= "ED_MARKER_OT_move";
+ ot->idname= "MARKER_OT_move";
/* api callbacks */
ot->exec= ed_marker_move_exec;
@@ -548,11 +548,11 @@
return ed_marker_move_invoke(C, op, evt);
}
-static void ED_MARKER_OT_duplicate(wmOperatorType *ot)
+static void MARKER_OT_duplicate(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Duplicate Time Marker";
- ot->idname= "ED_MARKER_OT_duplicate";
+ ot->idname= "MARKER_OT_duplicate";
/* api callbacks */
ot->exec= ed_marker_duplicate_exec;
@@ -638,22 +638,22 @@
return ed_marker_select(C, evt, 0);
}
-static void ED_MARKER_OT_mouseselect(wmOperatorType *ot)
+static void MARKER_OT_mouseselect(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Time Marker";
- ot->idname= "ED_MARKER_OT_mouseselect";
+ ot->idname= "MARKER_OT_mouseselect";
/* api callbacks */
ot->invoke= ed_marker_select_invoke;
ot->poll= ED_operator_areaactive;
}
-static void ED_MARKER_OT_mouseselect_extend(wmOperatorType *ot)
+static void MARKER_OT_mouseselect_extend(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Extend Select Time Marker";
- ot->idname= "ED_MARKER_OT_mouseselect_extend";
+ ot->idname= "MARKER_OT_mouseselect_extend";
/* api callbacks */
ot->invoke= ed_marker_select_extend_invoke;
@@ -721,11 +721,11 @@
return 1;
}
-static void ED_MARKER_OT_border_select(wmOperatorType *ot)
+static void MARKER_OT_border_select(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Marker Border select";
- ot->idname= "ED_MARKER_OT_border_select";
+ ot->idname= "MARKER_OT_border_select";
/* api callbacks */
ot->exec= ed_marker_border_select_exec;
@@ -781,11 +781,11 @@
return ed_marker_select_all_exec(C, op);
}
-static void ED_MARKER_OT_select_all(wmOperatorType *ot)
+static void MARKER_OT_select_all(wmOperatorType *ot)
{
/* identifiers */
ot->name= "(De)select all markers";
- ot->idname= "ED_MARKER_OT_select_all";
+ ot->idname= "MARKER_OT_select_all";
/* api callbacks */
ot->exec= ed_marker_select_all_exec;
@@ -822,11 +822,11 @@
}
-static void ED_MARKER_OT_delete(wmOperatorType *ot)
+static void MARKER_OT_delete(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Delete Markers";
- ot->idname= "ED_MARKER_OT_delete";
+ ot->idname= "MARKER_OT_delete";
/* api callbacks */
ot->invoke= WM_operator_confirm;
@@ -840,14 +840,14 @@
/* called in screen_ops.c:ED_operatortypes_screen() */
void ED_marker_operatortypes(void)
{
- WM_operatortype_append(ED_MARKER_OT_add);
- WM_operatortype_append(ED_MARKER_OT_move);
- WM_operatortype_append(ED_MARKER_OT_duplicate);
- WM_operatortype_append(ED_MARKER_OT_mouseselect);
- WM_operatortype_append(ED_MARKER_OT_mouseselect_extend);
- WM_operatortype_append(ED_MARKER_OT_border_select);
- WM_operatortype_append(ED_MARKER_OT_select_all);
- WM_operatortype_append(ED_MARKER_OT_delete);
+ WM_operatortype_append(MARKER_OT_add);
+ WM_operatortype_append(MARKER_OT_move);
+ WM_operatortype_append(MARKER_OT_duplicate);
+ WM_operatortype_append(MARKER_OT_mouseselect);
+ WM_operatortype_append(MARKER_OT_mouseselect_extend);
+ WM_operatortype_append(MARKER_OT_border_select);
+ WM_operatortype_append(MARKER_OT_select_all);
+ WM_operatortype_append(MARKER_OT_delete);
}
/* called in screen_ops.c:ED_keymap_screen() */
@@ -855,16 +855,16 @@
{
ListBase *keymap= WM_keymap_listbase(wm, "Markers", 0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_move", EVT_TWEAK_R, KM_ANY,
0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_duplicate", DKEY, KM_PRESS,
KM_SHIFT, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_mouseselect", RIGHTMOUSE,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_mouseselect_extend",
RIGHTMOUSE, KM_PRESS, KM_SHIFT, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_border_select", BKEY,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_select_all", AKEY,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_MARKER_OT_delete", XKEY, KM_PRESS, 0,
0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_move", EVT_TWEAK_R, KM_ANY, 0,
0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_duplicate", DKEY, KM_PRESS,
KM_SHIFT, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect", RIGHTMOUSE,
KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect_extend",
RIGHTMOUSE, KM_PRESS, KM_SHIFT, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_border_select", BKEY,
KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS,
0, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "ED_MARKER_OT_move", GKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, 0, 0);
/* generates event, in end to make select work */
WM_keymap_verify_item(keymap, "WM_OT_tweak_gesture", RIGHTMOUSE,
KM_PRESS, 0, 0);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
2008-12-26 11:32:20 UTC (rev 18071)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
2008-12-26 11:33:41 UTC (rev 18072)
@@ -201,13 +201,13 @@
return OPERATOR_RUNNING_MODAL;
}
-void ED_ANIM_OT_change_frame(wmOperatorType *ot)
+void ANIM_OT_change_frame(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Change frame";
- ot->idname= "ED_ANIM_OT_change_frame";
+ ot->idname= "ANIM_OT_change_frame";
/* api callbacks */
ot->exec= change_frame_exec;
@@ -252,11 +252,11 @@
return OPERATOR_FINISHED;
}
-void ED_ANIM_OT_previewrange_define(wmOperatorType *ot)
+void ANIM_OT_previewrange_define(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Set Preview Range";
- ot->idname= "ED_ANIM_OT_previewrange_define";
+ ot->idname= "ANIM_OT_previewrange_define";
/* api callbacks */
ot->invoke= WM_border_select_invoke;
@@ -296,11 +296,11 @@
return OPERATOR_FINISHED;
}
-void ED_ANIM_OT_previewrange_clear(wmOperatorType *ot)
+void ANIM_OT_previewrange_clear(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Clear Preview Range";
- ot->idname= "ED_ANIM_OT_previewrange_clear";
+ ot->idname= "ANIM_OT_previewrange_clear";
/* api callbacks */
ot->exec= previewrange_clear_exec;
@@ -358,11 +358,11 @@
return OPERATOR_FINISHED;
}
-void ED_ANIM_OT_toggle_time(wmOperatorType *ot)
+void ANIM_OT_toggle_time(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Frames/Seconds";
- ot->idname= "ED_ANIM_OT_toggle_time";
+ ot->idname= "ANIM_OT_toggle_time";
/* api callbacks */
ot->exec= toggle_time_exec;
@@ -372,22 +372,22 @@
void ED_operatortypes_anim(void)
{
- WM_operatortype_append(ED_ANIM_OT_change_frame);
- WM_operatortype_append(ED_ANIM_OT_toggle_time);
+ WM_operatortype_append(ANIM_OT_change_frame);
+ WM_operatortype_append(ANIM_OT_toggle_time);
- WM_operatortype_append(ED_ANIM_OT_previewrange_define);
- WM_operatortype_append(ED_ANIM_OT_previewrange_clear);
+ WM_operatortype_append(ANIM_OT_previewrange_define);
+ WM_operatortype_append(ANIM_OT_previewrange_clear);
}
void ED_keymap_anim(wmWindowManager *wm)
{
ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0);
- WM_keymap_verify_item(keymap, "ED_ANIM_OT_change_frame", LEFTMOUSE,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_ANIM_OT_toggle_time", TKEY, KM_PRESS,
0, 0);
+ 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, 0,
0);
/* preview range */
- WM_keymap_verify_item(keymap, "ED_ANIM_OT_previewrange_define", PKEY,
KM_PRESS, KM_CTRL, 0);
- WM_keymap_verify_item(keymap, "ED_ANIM_OT_previewrange_clear", PKEY,
KM_PRESS, KM_ALT, 0);
+ WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_define", PKEY,
KM_PRESS, KM_CTRL, 0);
+ WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_clear", PKEY,
KM_PRESS, KM_ALT, 0);
}
Modified:
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-26 11:32:20 UTC (rev 18071)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-26 11:33:41 UTC (rev 18072)
@@ -234,13 +234,11 @@
return OPERATOR_RUNNING_MODAL;
}
-void ED_View2D_OT_view_pan(wmOperatorType *ot)
+void View2D_OT_view_pan(wmOperatorType *ot)
{
- PropertyRNA *prop;
-
/* identifiers */
ot->name= "Pan View";
- ot->idname= "ED_View2D_OT_view_pan";
+ ot->idname= "View2D_OT_view_pan";
/* api callbacks */
ot->exec= view_pan_exec;
@@ -251,8 +249,8 @@
ot->flag= OPTYPE_REGISTER;
/* rna - must keep these in sync with the other operators */
- prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
- prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+ RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+ RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
}
/* ------------------ Scrollwheel Versions (2) ---------------------- */
@@ -275,13 +273,11 @@
return OPERATOR_FINISHED;
}
-void ED_View2D_OT_view_scrollright(wmOperatorType *ot)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
