[Bf-blender-cvs] [dcc4b2cc25f] blender2.8: Fix missing show_weight from overlay UI

[Campbell Barton]

Commit: dcc4b2cc25fabd0ecc2967428982b60670a02b89
Author: Campbell Barton
Date:   Sun May 6 12:17:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdcc4b2cc25fabd0ecc2967428982b60670a02b89

Fix missing show_weight from overlay UI

Missed when moving settings out of the mesh.

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 42facabbc41..b440ac790f4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3585,6 +3585,7 @@ class VIEW3D_PT_overlay(Panel):
         view = context.space_data
         overlay = view.overlay
         scene = context.scene
+        toolsettings = context.tool_settings
         display_all = overlay.show_overlays
 
         col = layout.column()
@@ -3630,6 +3631,10 @@ class VIEW3D_PT_overlay(Panel):
 
             col.prop(overlay, "show_occlude_wire")
 
+            col.prop(overlay, "show_weight")
+            col.label("Show Zero Weights:")
+            col.row().prop(toolsettings, "vertex_group_user", expand=True)
+
             col.label(text="Normals:")
             row = col.row(align=True)
 
@@ -3641,6 +3646,7 @@ class VIEW3D_PT_overlay(Panel):
             sub.active = overlay.show_vertex_normals or overlay.show_face_normals or overlay.show_split_normals
             sub.prop(overlay, "normals_length", text="Size")
 
+
         elif context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
             col.separator()
             col.label(text="Paint Mode:")
@@ -3776,8 +3782,6 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
         if with_freestyle:
             col.prop(mesh, "show_edge_seams", text="Seams")
 
-        layout.prop(mesh, "show_weight")
-
         col = split.column()
         col.label()
         if not with_freestyle:
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index f1569e9df8a..0f51c6ba587 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -99,10 +99,6 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
         col.label("Double Threshold:")
         col.prop(tool_settings, "double_threshold", text="")
 
-        if mesh.show_weight:
-            col.label("Show Zero Weights:")
-            col.row().prop(tool_settings, "vertex_group_user", expand=True)
-
 # ********** default tools for editmode_curve ****************
 
 class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):