diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
| commit | 7c6136b35ca18da5a36b6030ade3b45dc5cb483d (patch) | |
| tree | ccbb462c30e9c1f7419ff255e2ddfee7bbc81b91 /source/blender/editors/space_topbar | |
| parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
| parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_topbar')
| -rw-r--r-- | source/blender/editors/space_topbar/space_topbar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c index 6113922c02e..db75545fbd6 100644 --- a/source/blender/editors/space_topbar/space_topbar.c +++ b/source/blender/editors/space_topbar/space_topbar.c @@ -128,7 +128,7 @@ static void topbar_main_region_init(wmWindowManager *wm, ARegion *region) } UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_HEADER, region->winx, region->winy); - keymap = WM_keymap_find(wm->defaultconf, "View2D Buttons List", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); } |