[Bf-blender-cvs] [deeb2634633] master: Fix T64652: tool settings is gone from top-bar

[Campbell Barton]

Commit: deeb2634633fb60e9f293123165f3148839672f0
Author: Campbell Barton
Date:   Thu May 16 22:13:28 2019 +1000
Branches: master
https://developer.blender.org/rBdeeb2634633fb60e9f293123165f3148839672f0

Fix T64652: tool settings is gone from top-bar

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 0af7c797b27..26d480ac089 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -79,7 +79,7 @@ def is_not_gpencil_edit_mode(context):
 
 
 class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".mesh_edit"  # dot on purpose (access from topbar)
     bl_label = "Options"
 
@@ -115,7 +115,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
 
 
 class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".curve_edit"  # dot on purpose (access from topbar)
     bl_label = "Curve Stroke"
 
@@ -172,9 +172,9 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):
 
 
 class VIEW3D_PT_tools_armatureedit_options(View3DPanel, Panel):
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".armature_edit"  # dot on purpose (access from topbar)
-    bl_label = "Armature Options"
+    bl_label = "Options"
 
     def draw(self, context):
         arm = context.active_object.data
@@ -185,7 +185,7 @@ class VIEW3D_PT_tools_armatureedit_options(View3DPanel, Panel):
 # ********** default tools for pose-mode ****************
 
 class VIEW3D_PT_tools_posemode_options(View3DPanel, Panel):
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".posemode"  # dot on purpose (access from topbar)
     bl_label = "Pose Options"
 
@@ -1526,7 +1526,7 @@ class VIEW3D_MT_tools_projectpaint_stencil(Menu):
 # TODO, move to space_view3d.py
 class VIEW3D_PT_tools_particlemode_options(View3DPanel, Panel):
     """Default tools for particle mode"""
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".particlemode"
     bl_label = "Options"
     bl_options = {'DEFAULT_CLOSED'}
@@ -1576,7 +1576,7 @@ class VIEW3D_PT_tools_particlemode_options(View3DPanel, Panel):
 
 class VIEW3D_PT_tools_particlemode_options_shapecut(View3DPanel, Panel):
     """Default tools for particle mode"""
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_parent_id = "VIEW3D_PT_tools_particlemode_options"
     bl_label = "Cut Particles to Shape"
     bl_options = {'DEFAULT_CLOSED'}
@@ -1595,7 +1595,7 @@ class VIEW3D_PT_tools_particlemode_options_shapecut(View3DPanel, Panel):
 
 class VIEW3D_PT_tools_particlemode_options_display(View3DPanel, Panel):
     """Default tools for particle mode"""
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_parent_id = "VIEW3D_PT_tools_particlemode_options"
     bl_label = "Viewport Display"
 
@@ -1622,7 +1622,7 @@ class VIEW3D_PT_tools_particlemode_options_display(View3DPanel, Panel):
 
 
 class VIEW3D_PT_tools_meshedit_normal(View3DPanel, Panel):
-    bl_category = "Options"
+    bl_category = "Tool"
     bl_context = ".mesh_edit"
     bl_label = "Normals"
     bl_options = {'DEFAULT_CLOSED'}