[Bf-blender-cvs] [f428efc6db3] blender2.8: Correct toolbar tips for non sculpt modes

[Campbell Barton]

Commit: f428efc6db374579a56c1006ec0b1dc873b50938
Author: Campbell Barton
Date:   Tue Sep 4 08:09:48 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBf428efc6db374579a56c1006ec0b1dc873b50938

Correct toolbar tips for non sculpt modes

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

M	release/scripts/startup/bl_ui/space_toolsystem_common.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 191cae2ea20..ba06a4e4b50 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -763,22 +763,21 @@ def keymap_from_context(context, space_type):
                         # PAINT_OT_brush_select
                         brush = bpy.data.brushes.get(item.data_block)
                         if brush is not None:
-                            # print(dir(brush))
-                            mode = context.mode
-                            attr = {
-                                'SCULPT': "sculpt_tool",
-                                'VERTEX_PAINT': "vertex_paint_tool",
-                                'WEIGHT_PAINT': "weight_paint_tool",
-                                'TEXTURE_PAINT': "texture_paint_tool",
+                            mode = context.active_object.mode
+                            attr_op, attr_brush = {
+                                'SCULPT': ("sculpt_tool", "sculpt_tool"),
+                                'WEIGHT_PAINT': ("weight_paint_tool", "vertex_tool"),
+                                'VERTEX_PAINT': ("vertex_paint_tool", "vertex_tool"),
+                                'TEXTURE_PAINT': ("texture_paint_tool", "image_tool"),
                             }[mode]
                             kmi_hack_brush_select_properties.paint_mode = mode
-                            setattr(kmi_hack_brush_select_properties, attr, getattr(brush, attr))
+                            setattr(kmi_hack_brush_select_properties, attr_op, getattr(brush, attr_brush))
                             kmi_found = wm.keyconfigs.find_item_from_operator(
                                 idname="paint.brush_select",
                                 context='INVOKE_REGION_WIN',
                                 properties=kmi_hack_brush_select_properties,
                             )[1]
-                            del mode, attr
+                            del mode, attr_op, attr_brush
 
             else:
                 kmi_found = None