Revision: 30445
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30445
Author: campbellbarton
Date: 2010-07-17 20:02:10 +0200 (Sat, 17 Jul 2010)
Log Message:
-----------
reverting commit r28693. Making backspace a 3rd delete key.
We already have 2 keys for delete, no need to add a 3rd, better use backspace
only when it makes sense or allow users to hook it up to something.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/metaball/mball_ops.c
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/physics/physics_ops.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_nla/nla_ops.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -2005,7 +2005,6 @@
/* delete */
WM_keymap_add_item(keymap, "ANIM_OT_channels_delete", XKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "ANIM_OT_channels_delete", DELKEY, KM_PRESS,
0, 0);
- WM_keymap_add_item(keymap, "ANIM_OT_channels_delete", BACKSPACEKEY,
KM_PRESS, 0, 0);
/* settings */
WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_toggle", WKEY,
KM_PRESS, KM_SHIFT, 0);
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -1201,7 +1201,6 @@
WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS,
0, 0);
WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "MARKER_OT_delete", DELKEY, KM_PRESS, 0,
0);
- WM_keymap_verify_item(keymap, "MARKER_OT_delete", BACKSPACEKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, 0, 0);
#ifdef DURIAN_CAMERA_SWITCH
Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -192,7 +192,6 @@
/* Armature -> Etch-A-Ton ------------------------ */
WM_keymap_add_item(keymap, "SKETCH_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "SKETCH_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "SKETCH_OT_delete", BACKSPACEKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "SKETCH_OT_finish_stroke", RIGHTMOUSE,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "SKETCH_OT_cancel_stroke", ESCKEY, KM_PRESS,
0, 0);
// Already part of view3d select
@@ -238,7 +237,6 @@
WM_keymap_add_item(keymap, "ARMATURE_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_delete", DELKEY, KM_PRESS, 0,
0);
- WM_keymap_add_item(keymap, "ARMATURE_OT_delete", BACKSPACEKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_duplicate_move", DKEY,
KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_extrude_move", EKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_extrude_forked", EKEY,
KM_PRESS, KM_SHIFT, 0);
Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -214,7 +214,6 @@
WM_keymap_add_item(keymap, "CURVE_OT_cyclic_toggle", CKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "CURVE_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "CURVE_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "CURVE_OT_delete", BACKSPACEKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "TRANSFORM_OT_tilt", TKEY, KM_PRESS,
KM_CTRL, 0);
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -299,7 +299,6 @@
WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "MESH_OT_delete", BACKSPACEKEY, KM_PRESS, 0,
0);
WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, 0,
KKEY);
RNA_enum_set(WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE,
KM_PRESS, KM_SHIFT, KKEY)->ptr, "type", 2/*KNIFE_MIDPOINT*/);
Modified: trunk/blender/source/blender/editors/metaball/mball_ops.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/metaball/mball_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -64,7 +64,6 @@
WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", XKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", DELKEY,
KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", BACKSPACEKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MBALL_OT_duplicate_metaelems", DKEY,
KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "MBALL_OT_select_all", AKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/object/object_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -331,7 +331,6 @@
WM_keymap_add_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "OBJECT_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "OBJECT_OT_delete", BACKSPACEKEY, KM_PRESS,
0, 0);
WM_keymap_add_menu(keymap, "INFO_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "OBJECT_OT_duplicates_make_real", AKEY,
KM_PRESS, KM_SHIFT|KM_CTRL, 0);
Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -100,7 +100,6 @@
WM_keymap_add_item(keymap, "PARTICLE_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "PARTICLE_OT_delete", DELKEY, KM_PRESS, 0,
0);
- WM_keymap_add_item(keymap, "PARTICLE_OT_delete", BACKSPACEKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "PARTICLE_OT_reveal", HKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/space_action/action_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_ops.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/space_action/action_ops.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -145,7 +145,6 @@
WM_keymap_add_item(keymap, "ACTION_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ACTION_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "ACTION_OT_delete", BACKSPACEKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "ACTION_OT_duplicate", DKEY, KM_PRESS,
KM_SHIFT, 0);
WM_keymap_add_item(keymap, "ACTION_OT_keyframe_insert", IKEY, KM_PRESS,
0, 0);
Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/space_file/space_file.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -393,8 +393,6 @@
WM_keymap_add_item(keymap, "FILE_OT_directory_new", IKEY, KM_PRESS, 0,
0); /* XXX needs button */
WM_keymap_add_item(keymap, "FILE_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "FILE_OT_delete", BACKSPACEKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "FILE_OT_delete", BACKSPACEKEY, KM_PRESS,
KM_OSKEY, 0);
WM_keymap_verify_item(keymap, "FILE_OT_smoothscroll", TIMER1, KM_ANY,
KM_ANY, 0);
/* keys for main area */
Modified: trunk/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_ops.c
2010-07-17 17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/space_graph/graph_ops.c
2010-07-17 18:02:10 UTC (rev 30445)
@@ -347,7 +347,6 @@
WM_keymap_add_item(keymap, "GRAPH_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "GRAPH_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "GRAPH_OT_delete", BACKSPACEKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "GRAPH_OT_duplicate", DKEY, KM_PRESS,
KM_SHIFT, 0);
Modified: trunk/blender/source/blender/editors/space_nla/nla_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
+++ trunk/blender/source/blender/editors/space_nla/nla_ops.c 2010-07-17
18:02:10 UTC (rev 30445)
@@ -177,7 +177,6 @@
/* delete tracks */
WM_keymap_add_item(keymap, "NLA_OT_delete_tracks", XKEY, KM_PRESS, 0,
0);
WM_keymap_add_item(keymap, "NLA_OT_delete_tracks", DELKEY, KM_PRESS, 0,
0);
- WM_keymap_add_item(keymap, "NLA_OT_delete_tracks", BACKSPACEKEY,
KM_PRESS, 0, 0);
/* General Animation Channels keymap (see anim_channels.c)
----------------------- */
/* selection */
@@ -247,8 +246,7 @@
/* delete */
WM_keymap_add_item(keymap, "NLA_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NLA_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "NLA_OT_delete", BACKSPACEKEY, KM_PRESS, 0,
0);
-
+
/* split */
WM_keymap_add_item(keymap, "NLA_OT_split", YKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c 2010-07-17
17:50:20 UTC (rev 30444)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
