diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/editors/interface/interface_region_tooltip.c | |
parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_region_tooltip.c')
-rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index e3d90ceb7a2..70e0f07ea6c 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -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"); |