diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-14 18:42:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-14 18:42:47 +0400 |
| commit | 9e6860d864d0f630f92f2fb7130412e9387aea26 (patch) | |
| tree | 766bbe23db54fea7829a1b2b5c297ae68469c5c8 /source/blender/editors/interface/interface_regions.c | |
| parent | 1ace39c86bf54271cdc2ce7ae5bb4166715cd02a (diff) | |
fix [#29242] menus have no keyboard shortcuts
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 34b62155314..837a9d12af1 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -408,7 +408,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) /* operator keymap (not menus, they already have it) */ prop= (but->opptr)? but->opptr->data: NULL; - if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, buf, sizeof(buf))) { + if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE, buf, sizeof(buf))) { BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Shortcut: %s"), buf); data->color[data->totline]= 0x888888; data->totline++; @@ -493,8 +493,8 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) } else if (ELEM(but->type, MENU, PULLDOWN)) { if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) { - if(but->menu_create_func && WM_menutype_contains((MenuType *)but->poin)) { - MenuType *mt= (MenuType *)but->poin; + MenuType *mt= uiButGetMenuType(but); + if (mt) { BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Python: %s"), mt->idname); data->color[data->totline]= 0x888888; data->totline++; |