2.5:

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

diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 4f37ce6be454ec26d180503884c27e4a83c0929f..ae6689265825b1d20c09fa61fdfcf5d4ce84822b 100644 (file)
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -202,7 +202,7 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
                layout.itemO("SEQUENCER_OT_images_separate")
                layout.itemS()
                
-               layout.itemO("SEQUENCER_OT_duplicate_add")
+               layout.itemO("SEQUENCER_OT_duplicate")
                layout.itemO("SEQUENCER_OT_delete")
                
                strip = act_strip(context)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index a866b219b9d0d497246f6ff1fabce3ee7d406fe4..990ba1eb6b61e6d583078d8984b2e9675d62af0c 100644 (file)
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -15,7 +15,7 @@ class VIEW3D_PT_tools_objectmode(View3DPanel):
        def draw(self, context):
                layout = self.layout
 
-               layout.row().itemO("OBJECT_OT_duplicate_add")
+               layout.row().itemO("OBJECT_OT_duplicate")
                layout.row().itemO("OBJECT_OT_delete")
                layout.row().itemO("OBJECT_OT_mesh_add")
                layout.row().itemO("OBJECT_OT_curve_add")
@@ -36,7 +36,7 @@ class VIEW3D_PT_tools_editmode_mesh(View3DPanel):
        def draw(self, context):
                layout = self.layout
 
-               layout.row().itemO("MESH_OT_duplicate_add")
+               layout.row().itemO("MESH_OT_duplicate")
                layout.row().itemO("MESH_OT_delete")
                layout.row().itemO("MESH_OT_spin")
                layout.row().itemO("MESH_OT_screw")

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index f8e03e74f2455809cf49efd159ab53aa3e3ce888..6a5b743056af0862ec893047f8aa55f2a331e487 100644 (file)
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -5959,7 +5959,7 @@ Base *ED_object_add_duplicate(Scene *scene, Base *base, int usedupflag)
 }
 
 /* contextual operator dupli */
-static int duplicate_add_exec(bContext *C, wmOperator *op)
+static int duplicate_exec(bContext *C, wmOperator *op)
 {
        Scene *scene= CTX_data_scene(C);
        View3D *v3d= CTX_wm_view3d(C);
@@ -5991,9 +5991,9 @@ static int duplicate_add_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-static int duplicate_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       duplicate_add_exec(C, op);
+       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);
@@ -6001,17 +6001,17 @@ static int duplicate_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
        return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_duplicate_add(wmOperatorType *ot)
+void OBJECT_OT_duplicate(wmOperatorType *ot)
 {
        
        /* identifiers */
        ot->name= "Duplicate Objects";
        ot->description = "Duplicate the objects.";
-       ot->idname= "OBJECT_OT_duplicate_add";
+       ot->idname= "OBJECT_OT_duplicate";
        
        /* api callbacks */
-       ot->invoke= duplicate_add_invoke;
-       ot->exec= duplicate_add_exec;
+       ot->invoke= duplicate_invoke;
+       ot->exec= duplicate_exec;
        
        ot->poll= ED_operator_scene_editable;
        

diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 0948bfa405b85fdf56d867f6202f7c9e001e70da..12776c08d4f6b85367b44486f1b634cd4cd0cc45 100644 (file)
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -61,7 +61,7 @@ void OBJECT_OT_slowparent_clear(struct wmOperatorType *ot);
 void OBJECT_OT_center_set(struct wmOperatorType *ot);
 void OBJECT_OT_dupli_set_real(struct wmOperatorType *ot);
 void OBJECT_OT_object_add(struct wmOperatorType *ot);
-void OBJECT_OT_duplicate_add(struct wmOperatorType *ot);
+void OBJECT_OT_duplicate(struct wmOperatorType *ot);
 void OBJECT_OT_delete(struct wmOperatorType *ot);
 
 void OBJECT_OT_mesh_add(struct wmOperatorType *ot);

diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 3710271bd2007e50f04350458401f040bbdf5ce5..3a9973b7ec5dc1f2ed85491d305d9dae753f4a14 100644 (file)
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -84,7 +84,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_slowparent_clear);
        WM_operatortype_append(OBJECT_OT_center_set);
        WM_operatortype_append(OBJECT_OT_dupli_set_real);
-       WM_operatortype_append(OBJECT_OT_duplicate_add);
+       WM_operatortype_append(OBJECT_OT_duplicate);
        WM_operatortype_append(GROUP_OT_group_create);
        WM_operatortype_append(GROUP_OT_objects_remove);
        WM_operatortype_append(GROUP_OT_objects_add_active);
@@ -160,7 +160,7 @@ void ED_keymap_object(wmWindowManager *wm)
        
        WM_keymap_verify_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0);
        WM_keymap_verify_item(keymap, "OBJECT_OT_primitive_add", AKEY, KM_PRESS, KM_SHIFT, 0);
-       WM_keymap_verify_item(keymap, "OBJECT_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_verify_item(keymap, "OBJECT_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
        
        // XXX this should probably be in screen instead... here for testing purposes in the meantime... - Aligorith
        WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe_menu", IKEY, KM_PRESS, 0, 0);

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 1ba14bbd10e4d1318b833c0769608cd4f5b59d8e..89d81f846d22ba216329894b1100508487b38505 100644 (file)
--- 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 b16971dab9e38ba7475c999a6375adb83416bdbc..d6680457376e0a0deffc1f26b58c66958a15a543 100644 (file)
--- 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 6df5dbd71d01a45cc371fef71e53e84c5caf742f..f78abb283130e283a7b6afe4c1407c3b8e477e7d 100644 (file)
--- 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);

diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 933c50ad20c7b510d067e7c9008147ddfa6be63c..a030603996c2ef87386bafef286be5987c9301ea 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1854,12 +1854,12 @@ static int sequencer_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *
        return OPERATOR_FINISHED;
 }
 
-void SEQUENCER_OT_duplicate_add(wmOperatorType *ot)
+void SEQUENCER_OT_duplicate(wmOperatorType *ot)
 {
 
        /* identifiers */
-       ot->name= "Add Duplicate";
-       ot->idname= "SEQUENCER_OT_duplicate_add";
+       ot->name= "Duplicate";
+       ot->idname= "SEQUENCER_OT_duplicate";
 
        /* api callbacks */
        ot->invoke= sequencer_add_duplicate_invoke;

diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 0786ad17f1e7d45a98e2ac15a1ec26e638a63ecc..ac396440a002fcf00053d42663ba3c5f85af42a0 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -83,7 +83,7 @@ void SEQUENCER_OT_lock(struct wmOperatorType *ot);
 void SEQUENCER_OT_unlock(struct wmOperatorType *ot);
 void SEQUENCER_OT_reload(struct wmOperatorType *ot);
 void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot);
-void SEQUENCER_OT_duplicate_add(struct wmOperatorType *ot);
+void SEQUENCER_OT_duplicate(struct wmOperatorType *ot);
 void SEQUENCER_OT_delete(struct wmOperatorType *ot);
 void SEQUENCER_OT_images_separate(struct wmOperatorType *ot);
 void SEQUENCER_OT_meta_toggle(struct wmOperatorType *ot);

diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c
index fd1d2237c10df0b1297141e33e95b0ad822ef57e..82047272049a6c36db073dca262db7825b047edd 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_ops.c
+++ b/source/blender/editors/space_sequencer/sequencer_ops.c
@@ -70,7 +70,7 @@ void sequencer_operatortypes(void)
        WM_operatortype_append(SEQUENCER_OT_unlock);
        WM_operatortype_append(SEQUENCER_OT_reload);
        WM_operatortype_append(SEQUENCER_OT_refresh_all);
-       WM_operatortype_append(SEQUENCER_OT_duplicate_add);
+       WM_operatortype_append(SEQUENCER_OT_duplicate);
        WM_operatortype_append(SEQUENCER_OT_delete);
        WM_operatortype_append(SEQUENCER_OT_images_separate);
        WM_operatortype_append(SEQUENCER_OT_meta_toggle);
@@ -127,7 +127,7 @@ void sequencer_keymap(wmWindowManager *wm)
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_reload", RKEY, KM_PRESS, KM_ALT, 0);
 
-       WM_keymap_add_item(keymap, "SEQUENCER_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "SEQUENCER_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", XKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", DELKEY, KM_PRESS, 0, 0);