archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-11-06 00:07:19 +11:00
parent d2ea1b2dcd 18d7fbe4f5
commit 58dc114615
54 changed files with 344 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface_region_tooltip.c
View File

@@ -337,7 +337,7 @@ static uiTooltipData *ui_tooltip_data_from_keymap(bContext *C, wmKeyMap *keymap)
.color_id = UI_TIP_LC_NORMAL,
});
bool found = false;
if (WM_keymap_item_to_string(kmi, false, sizeof(buf), buf)) {
if (WM_keymap_item_to_string(kmi, false, buf, sizeof(buf))) {
found = true;
}
field->text = BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None");