[Bf-blender-cvs] [720e19a8332] master: Fix T62945: Hotkeys not showing up in brush tooltips

[Joseph Eagar]

Commit: 720e19a83325be62a68a777897fb706a23854cf7
Author: Joseph Eagar
Date:   Thu Apr 28 23:13:53 2022 -0700
Branches: master
https://developer.blender.org/rB720e19a83325be62a68a777897fb706a23854cf7

Fix T62945: Hotkeys not showing up in brush tooltips

===================================================================

M	source/blender/editors/interface/interface_region_tooltip.c
M	source/tools

===================================================================

diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index ca18ec14a54..c7ebecb178b 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -527,7 +527,10 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but, bool is
       const char *tool_attr = BKE_paint_get_tool_prop_id_from_paintmode(paint_mode);
       if (tool_attr != NULL) {
         const EnumPropertyItem *items = BKE_paint_get_tool_enum_from_paintmode(paint_mode);
-        const int i = RNA_enum_from_name(items, tool_id);
+        const char *tool_id_lstrip = strrchr(tool_id, '.');
+        const int tool_id_offset = tool_id_lstrip ? ((tool_id_lstrip - tool_id) + 1) : 0;
+        const int i = RNA_enum_from_name(items, tool_id + tool_id_offset);
+
         if (i != -1) {
           wmOperatorType *ot = WM_operatortype_find("paint.brush_select", true);
           PointerRNA op_props;
diff --git a/source/tools b/source/tools
index 284f78b77d1..c1586ae2959 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 284f78b77d137687bc7bed17c945ef651721cccf
+Subproject commit c1586ae29595713b597c22f6baa08d6cce423767