diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-10 14:35:18 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-10 14:35:18 +0400 |
| commit | 92c4fe8713d48f9c49df0eec6f563ed98bee88bb (patch) | |
| tree | f12fc8d995eacca0f4333af8430f7336f5863a25 /source/blender | |
| parent | ac1e737aa8c90b83844bb67755d49e8d883c7204 (diff) | |
Revert "Fix #28863: Inconsistent UI inside of the UV/ImageEditor window"
This reverts commit 40899 due to UI department feedback.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_file/space_file.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_logic/space_logic.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index caf2abe8564..7a70ed9c0a0 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -399,7 +399,7 @@ static void file_keymap(struct wmKeyConfig *keyconf) wmKeyMapItem *kmi; /* keys for all areas */ wmKeyMap *keymap= WM_keymap_find(keyconf, "File Browser", SPACE_FILE, 0); - WM_keymap_add_item(keymap, "FILE_OT_bookmark_toggle", TKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "FILE_OT_bookmark_toggle", NKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_parent", PKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_bookmark_add", BKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "FILE_OT_hidedot", HKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index c0585f30999..e345caf1359 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -505,8 +505,8 @@ static void image_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "IMAGE_OT_reload", RKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "IMAGE_OT_save", SKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "IMAGE_OT_save_as", F3KEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "IMAGE_OT_properties", TKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "IMAGE_OT_scopes", NKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "IMAGE_OT_properties", NKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "IMAGE_OT_scopes", TKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "IMAGE_OT_cycle_render_slot", JKEY, KM_PRESS, 0, 0); RNA_boolean_set(WM_keymap_add_item(keymap, "IMAGE_OT_cycle_render_slot", JKEY, KM_PRESS, KM_ALT, 0)->ptr, "reverse", TRUE); diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index 9602f9a401c..f420d0ef690 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -182,7 +182,7 @@ static void logic_keymap(struct wmKeyConfig *keyconf) { wmKeyMap *keymap= WM_keymap_find(keyconf, "Logic Editor", SPACE_LOGIC, 0); - WM_keymap_add_item(keymap, "LOGIC_OT_properties", TKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "LOGIC_OT_properties", NKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "LOGIC_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_menu(keymap, "LOGIC_MT_logicbricks_add", AKEY, KM_PRESS, KM_SHIFT, 0); } |