[Bf-blender-cvs] [5203ebbaad4] blender2.8: Tool System: remove cursor tool from paint modes

[Campbell Barton]

Commit: 5203ebbaad48cb972d9e2ba8845bdb6e1e3e34f8
Author: Campbell Barton
Date:   Thu Aug 23 12:12:11 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB5203ebbaad48cb972d9e2ba8845bdb6e1e3e34f8

Tool System: remove cursor tool from paint modes

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 69a98a06e0a..c042c328ae4 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1529,10 +1529,12 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
 
     _tools = {
         None: [
-            _defs_view3d_generic.cursor,
+            # Don't use this! because of paint modes.
+            # _defs_view3d_generic.cursor,
             # End group.
         ],
         'OBJECT': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
             None,
             *_tools_transform,
@@ -1540,7 +1542,9 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             *_tools_annotate,
         ],
         'POSE': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
+            None,
             *_tools_transform,
             None,
             *_tools_annotate,
@@ -1552,6 +1556,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             ),
         ],
         'EDIT_ARMATURE': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
             None,
             *_tools_transform,
@@ -1569,6 +1574,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             ),
         ],
         'EDIT_MESH': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
             None,
             *_tools_transform,
@@ -1615,6 +1621,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             ),
         ],
         'EDIT_CURVE': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
             None,
             *_tools_transform,
@@ -1625,6 +1632,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             _defs_edit_curve.extrude_cursor,
         ],
         'PARTICLE': [
+            _defs_view3d_generic.cursor,
             _defs_particle.generate_from_brushes,
         ],
         'SCULPT': [
@@ -1637,6 +1645,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             _defs_vertex_paint.generate_from_brushes,
         ],
         'PAINT_WEIGHT': [
+            # TODO, check for mixed pose mode
+            _defs_view3d_generic.cursor,
             _defs_weight_paint.generate_from_brushes,
             None,
             _defs_weight_paint.sample_weight,
@@ -1651,6 +1661,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             _defs_gpencil_paint.generate_from_brushes,
         ],
         'GPENCIL_EDIT': [
+            _defs_view3d_generic.cursor,
             *_tools_select,
             None,
             *_tools_transform,