Revision: 21441
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21441
Author: blendix
Date: 2009-07-08 23:41:35 +0200 (Wed, 08 Jul 2009)
Log Message:
-----------
2.5:
* Rename OT_duplicate_add, to OT_duplicate. Also fixes warning
print since I forgot to do this in the toolbar for MESH.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_sequencer.py
branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
Modified: branches/blender2.5/blender/release/ui/space_sequencer.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_sequencer.py 2009-07-08
21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/release/ui/space_sequencer.py 2009-07-08
21:41:35 UTC (rev 21441)
@@ -202,7 +202,7 @@
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)
Modified: branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
2009-07-08 21:41:35 UTC (rev 21441)
@@ -15,7 +15,7 @@
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 @@
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")
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-07-08 21:41:35 UTC (rev 21441)
@@ -5959,7 +5959,7 @@
}
/* 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 @@
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 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2009-07-08 21:41:35 UTC (rev 21441)
@@ -61,7 +61,7 @@
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);
Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2009-07-08 21:41:35 UTC (rev 21441)
@@ -84,7 +84,7 @@
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 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-07-08 21:41:35 UTC (rev 21441)
@@ -1689,7 +1689,7 @@
#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 @@
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 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
2009-07-08 21:41:35 UTC (rev 21441)
@@ -82,7 +82,7 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
2009-07-08 21:31:28 UTC (rev 21440)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
2009-07-08 21:41:35 UTC (rev 21441)
@@ -58,7 +58,7 @@
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 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-07-08 21:31:28 UTC (rev 21440)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-07-08 21:41:35 UTC (rev 21441)
@@ -1854,12 +1854,12 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
2009-07-08 21:31:28 UTC (rev 21440)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
2009-07-08 21:41:35 UTC (rev 21441)
@@ -83,7 +83,7 @@
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 output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
