2.5:

* Rename OT_duplicate_add, to OT_duplicate. Also fixes warning
  print since I forgot to do this in the toolbar for MESH.

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 1ba14bbd10e..89d81f846d2 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1689,7 +1689,7 @@ void node_mute(SpaceNode *snode)
 
 #endif
 
-int node_duplicate_add_exec(bContext *C, wmOperator *op)
+int node_duplicate_exec(bContext *C, wmOperator *op)
 {
 	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
 	
@@ -1702,9 +1702,9 @@ int node_duplicate_add_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-static int node_duplicate_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int node_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	node_duplicate_add_exec(C, op);
+	node_duplicate_exec(C, op);
 	
 	RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
 	WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
@@ -1712,17 +1712,17 @@ static int node_duplicate_add_invoke(bContext *C, wmOperator *op, wmEvent *event
 	return OPERATOR_FINISHED;
 }
 
-void NODE_OT_duplicate_add(wmOperatorType *ot)
+void NODE_OT_duplicate(wmOperatorType *ot)
 {
 	
 	/* identifiers */
 	ot->name= "Duplicate Nodes";
 	ot->description = "Duplicate the nodes.";
-	ot->idname= "NODE_OT_duplicate_add";
+	ot->idname= "NODE_OT_duplicate";
 	
 	/* api callbacks */
-	ot->invoke= node_duplicate_add_invoke;
-	ot->exec= node_duplicate_add_exec;
+	ot->invoke= node_duplicate_invoke;
+	ot->exec= node_duplicate_exec;
 	
 	ot->poll= ED_operator_node_active;
 	
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index b16971dab9e..d6680457376 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -82,7 +82,7 @@ void snode_composite_job(const struct bContext *C, ScrArea *sa);
 bNode *snode_get_editgroup(SpaceNode *snode);
 void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
 
-void NODE_OT_duplicate_add(struct wmOperatorType *ot);
+void NODE_OT_duplicate(struct wmOperatorType *ot);
 void NODE_OT_link(struct wmOperatorType *ot);
 void NODE_OT_delete(struct wmOperatorType *ot);
 void NODE_OT_resize(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index 6df5dbd71d0..f78abb28313 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -58,7 +58,7 @@ void node_operatortypes(void)
 	WM_operatortype_append(NODE_OT_link);
 	WM_operatortype_append(NODE_OT_resize);
 	WM_operatortype_append(NODE_OT_links_cut);
-	WM_operatortype_append(NODE_OT_duplicate_add);
+	WM_operatortype_append(NODE_OT_duplicate);
 	
 }
 
@@ -72,7 +72,7 @@ void node_keymap(struct wmWindowManager *wm)
 	RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
 	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_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
 	
 	WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0);