diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-04-09 17:16:17 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-04-09 17:16:17 +0400 |
| commit | 7e29154751ec6b93416e4d65028c54a4b0f9da96 (patch) | |
| tree | edd2fff48d5917ccb512153f5b3dc46c21134ee1 /source/blender/editors/screen/area.c | |
| parent | 9cea4b36589ccf1d69a8da6bcf84ad0ca4fdeeeb (diff) | |
Reversion of commit that changes order for keymaps. I thought it
would work for all cases, but greasepencil broke! Needs to get
a bit more thinking or design.
Diffstat (limited to 'source/blender/editors/screen/area.c')
| -rw-r--r-- | source/blender/editors/screen/area.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index cdfe179ecc2..3bf7fab4984 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -893,22 +893,22 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) rect= sa->totrct; region_rect_recursive(sa, sa->regionbase.first, &rect, 0); + /* default area handlers */ + ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag); /* checks spacedata, adds own handlers */ if(sa->type->init) sa->type->init(wm, sa); - /* default area handlers */ - ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag); /* region windows, default and own handlers */ for(ar= sa->regionbase.first; ar; ar= ar->next) { region_subwindow(wm, win, ar); if(ar->swinid) { + /* default region handlers */ + ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag); /* own handlers */ if(ar->type->init) ar->type->init(wm, ar); - /* default region handlers */ - ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag); } else { /* prevent uiblocks to run */ |