diff options
| author | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-07-04 19:56:42 +0400 |
|---|---|---|
| committer | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-07-04 19:56:42 +0400 |
| commit | d43e1fa7beb03368eaaa3c89ef95d69ebd693734 (patch) | |
| tree | 2a63c1d49c735c48edb1ee036a8db4e424293078 /source/blender/editors/object/object_ops.c | |
| parent | a953e4bbe33f24bef6fd018c7413e904a9628e5b (diff) | |
| parent | 558721ab59bd4e6186005f5e9aca50e094c9e72c (diff) | |
svn merge ^/trunk/blender -r48095:48592
Diffstat (limited to 'source/blender/editors/object/object_ops.c')
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index addc6cd4277..f8f4fe9c4e5 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -105,6 +105,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_select_mirror); WM_operatortype_append(GROUP_OT_create); + WM_operatortype_append(GROUP_OT_objects_remove_all); WM_operatortype_append(GROUP_OT_objects_remove); WM_operatortype_append(GROUP_OT_objects_add_active); WM_operatortype_append(GROUP_OT_objects_remove_active); @@ -395,6 +396,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) WM_keymap_verify_item(keymap, "GROUP_OT_create", GKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); + WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_all", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL | KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0); |