Revert "Fix #28863: Inconsistent UI inside of the UV/ImageEditor window"
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 10:35:18 +0000 (10:35 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 10:35:18 +0000 (10:35 +0000)
This reverts commit 40899 due to UI department feedback.

source/blender/editors/space_file/space_file.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_logic/space_logic.c

index caf2abe85648b4b16fcdfaecc058b99298d4dd8a..7a70ed9c0a0c879901f099f8059210fcbde3c9f2 100644 (file)
@@ -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);
index c0585f309997f62a81abc0997415d871c70988fc..e345caf1359e73ca38d427af59f6eb08070e3bd2 100644 (file)
@@ -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);
index 9602f9a401c9511e2389fbdbb234c250da5b7f59..f420d0ef690eb4823508801853301e10023b6d57 100644 (file)
@@ -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);
 }