[Bf-blender-cvs] [057ba2eb68e] blender2.8: Fix error generating toolbar tooltip

[Campbell Barton]

Commit: 057ba2eb68e57029ece6540cda9288911711e8ed
Author: Campbell Barton
Date:   Tue Nov 20 21:34:29 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB057ba2eb68e57029ece6540cda9288911711e8ed

Fix error generating toolbar tooltip

C code needed to be updated for module move.

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

M	release/scripts/startup/bl_ui/space_toolsystem_common.py
M	source/blender/editors/interface/interface_region_tooltip.c

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 8d9ec7986cf..94da1966f4d 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -29,7 +29,6 @@ __all__ = (
     "activate_by_name_or_cycle",
     "description_from_name",
     "keymap_from_name",
-    "keymap_from_context",
 )
 
 # Support reloading icons.
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 6bdcdf57f47..5782bb466f5 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -500,10 +500,10 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but, bool is
 			{
 				/* Generate keymap in order to inspect it.
 				 * Note, we could make a utility to avoid the keymap generation part of this. */
-				const char *expr_imports[] = {"bpy", "bl_ui", NULL};
+				const char *expr_imports[] = {"bpy", "bl_keymap_utils", "bl_keymap_utils.keymap_from_toolbar", NULL};
 				const char *expr = (
 				        "getattr("
-				        "bl_ui.space_toolsystem_common.keymap_from_context("
+				        "bl_keymap_utils.keymap_from_toolbar.generate("
 				        "bpy.context, "
 				        "bpy.context.space_data.type), "
 				        "'as_pointer', lambda: 0)()");