diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-15 19:40:31 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-15 19:40:31 +0400 |
commit | 41dd360420e3b069077ef5c063988b102fcb04ca (patch) | |
tree | e7aea08845258512c5bac0cf6ba1852b68438aad /source/blender/editors/space_node | |
parent | 4e4e8ef98f592c067d3f995077eeeebd83e4a629 (diff) |
2.5: Operator naming, reviewed some of the recent changes
by Shaul, did some minor tweaks.
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 14 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 044a8d3fabe..5ee7326cd2f 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1056,7 +1056,7 @@ typedef struct NodeSizeWidget { float oldwidth; } NodeSizeWidget; -static int node_size_widget_modal(bContext *C, wmOperator *op, wmEvent *event) +static int node_resize_modal(bContext *C, wmOperator *op, wmEvent *event) { SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C); ARegion *ar= CTX_wm_region(C); @@ -1099,7 +1099,7 @@ static int node_size_widget_modal(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static int node_size_widget_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int node_resize_invoke(bContext *C, wmOperator *op, wmEvent *event) { SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C); ARegion *ar= CTX_wm_region(C); @@ -1135,15 +1135,15 @@ static int node_size_widget_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_PASS_THROUGH; } -void NODE_OT_widget_size(wmOperatorType *ot) +void NODE_OT_resize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scale Node"; - ot->idname= "NODE_OT_widget_size"; + ot->name= "Resize Node"; + ot->idname= "NODE_OT_resize"; /* api callbacks */ - ot->invoke= node_size_widget_invoke; - ot->modal= node_size_widget_modal; + ot->invoke= node_resize_invoke; + ot->modal= node_resize_modal; ot->poll= ED_operator_node_active; /* flags */ diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 1ad0b348626..b73f57f935f 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -84,7 +84,7 @@ void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag); void NODE_OT_link(struct wmOperatorType *ot); void NODE_OT_delete(struct wmOperatorType *ot); -void NODE_OT_widget_size(struct wmOperatorType *ot); +void NODE_OT_resize(struct wmOperatorType *ot); void NODE_OT_links_cut(struct wmOperatorType *ot); // XXXXXX diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 7bd41154c1b..7a1cc24fa58 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -57,7 +57,7 @@ void node_operatortypes(void) WM_operatortype_append(NODE_OT_select_border); WM_operatortype_append(NODE_OT_delete); WM_operatortype_append(NODE_OT_link); - WM_operatortype_append(NODE_OT_widget_size); + WM_operatortype_append(NODE_OT_resize); WM_operatortype_append(NODE_OT_links_cut); } @@ -72,7 +72,7 @@ void node_keymap(struct wmWindowManager *wm) RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NODE_OT_widget_size", LEFTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_ALT, 0); |