diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 14:52:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 14:52:04 +0300 |
commit | eb63b32deea5772a5947cb6b77d2a89b1d22e6d1 (patch) | |
tree | 81f6754a8424058d4d97713d2e674dd3a403700f /source/blender/windowmanager/intern/wm_operators.c | |
parent | 41176cd3d820649488ec5a5475d5dc7e97a01a59 (diff) | |
parent | bdc1108e8cd8bf51e95de72d10862b4466dac8ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 331042963bf..9e2209333f7 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2019,8 +2019,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar if (mt) { UI_menutype_draw(C, mt, layout); -// wmWindowManager *wm = CTX_wm_manager(C); -// uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr, ICON_NONE); +// uiItemM(layout, "USERPREF_MT_keyconfigs", U.keyconfigstr, ICON_NONE); } UI_block_emboss_set(block, UI_EMBOSS_PULLDOWN); |