diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
| commit | 8f788c64db587e74079d812dbcea40c2bd4b91ff (patch) | |
| tree | c767e8318a9e7aded16be6cab2042f3ea11e7912 /source/blender/editors/space_userpref | |
| parent | 36bb566d4e6e06e08d782d610d60d755cbda2396 (diff) | |
merge with trunk/2.5 at r23876
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/editors/space_userpref')
| -rw-r--r-- | source/blender/editors/space_userpref/space_userpref.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 8c9d723ce2c..39fc2fd2bd1 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -115,7 +115,7 @@ void userpref_operatortypes(void) { } -void userpref_keymap(struct wmWindowManager *wm) +void userpref_keymap(struct wmKeyConfig *keyconf) { } @@ -167,7 +167,7 @@ void ED_spacetype_userpref(void) art->init= userpref_main_area_init; art->draw= userpref_main_area_draw; art->listener= userpref_main_area_listener; - art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D; + art->keymapflag= ED_KEYMAP_UI; BLI_addhead(&st->regiontypes, art); |