diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-10-21 01:12:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-21 01:12:09 +0400 |
commit | 29b0afde6e2220c581ebff9c3f41f43f687ec6bc (patch) | |
tree | 556e4bd0632ade2a34a571cb18e57c16b4925410 /source | |
parent | cac0e48dfb0f568ef83ff014647f0193a3a03a66 (diff) |
[#19445] New Object is not Grabbed after using Duplicate Linked
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/object/object_ops.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 8950fdcb049..f9fe5ca28fa 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -189,12 +189,21 @@ void ED_operatortypes_object(void) void ED_operatormacros_object(void) { wmOperatorType *ot; + wmOperatorTypeMacro *otmacro; ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate"); WM_operatortype_macro_define(ot, "TFM_OT_translate"); } + + /* grr, should be able to pass options on... */ + ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move_linked", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + if(ot) { + otmacro= WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate"); + RNA_boolean_set(otmacro->ptr, "linked", 1); + WM_operatortype_macro_define(ot, "TFM_OT_translate"); + } } static int object_mode_poll(bContext *C) @@ -266,7 +275,8 @@ void ED_keymap_object(wmKeyConfig *keyconf) RNA_string_set(kmi->ptr, "name", "VIEW3D_MT_make_single_user"); WM_keymap_add_item(keymap, "OBJECT_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_duplicate", DKEY, KM_PRESS, KM_ALT, 0)->ptr, "linked", 1); + WM_keymap_add_item(keymap, "OBJECT_OT_duplicate_move_linked", DKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_join", JKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "OBJECT_OT_convert", CKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "OBJECT_OT_proxy_make", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); |