[Bf-blender-cvs] [9569425b027] master: Fix T72064, T72158: weight paint shows X/Y/Z symmetry options that don't work

[Brecht Van Lommel]

Commit: 9569425b027cdb1c80e407697971f42fbee42388
Author: Brecht Van Lommel
Date:   Sun Dec 8 13:25:02 2019 +0100
Branches: master
https://developer.blender.org/rB9569425b027cdb1c80e407697971f42fbee42388

Fix T72064, T72158: weight paint shows X/Y/Z symmetry options that don't work

Only X-mirror is supported still. While we should support all these in the
future, the UI should match the current supported functionality.

Ref T65872

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

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 a1967d63d2e..0c3d9ec7524 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -140,12 +140,8 @@ class VIEW3D_HT_tool_header(Header):
             _row, sub = row_for_mirror()
             sub.prop(context.object.pose, "use_mirror_x", text="X", toggle=True)
         elif mode_string == 'PAINT_WEIGHT':
-            row, sub = row_for_mirror()
-            wpaint = context.tool_settings.weight_paint
-            sub.prop(wpaint, "use_symmetry_x", text="X", toggle=True)
-            sub.prop(wpaint, "use_symmetry_y", text="Y", toggle=True)
-            sub.prop(wpaint, "use_symmetry_z", text="Z", toggle=True)
-            row.popover(panel="VIEW3D_PT_tools_weightpaint_symmetry_for_topbar", text="")
+            _row, sub = row_for_mirror()
+            sub.prop(context.object.data, "use_mirror_x", text="X", toggle=True)
         elif mode_string == 'SCULPT':
             row, sub = row_for_mirror()
             sculpt = context.tool_settings.sculpt
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 718365ec99d..70904111b10 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1470,32 +1470,6 @@ class VIEW3D_PT_tools_brush_display_custom_icon(Panel, View3DPaintPanel):
 # ********** default tools for weight-paint ****************
 
 
-# TODO, move to space_view3d.py
-class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel):
-    bl_context = ".weightpaint"
-    bl_options = {'DEFAULT_CLOSED'}
-    bl_label = "Symmetry"
-
-    @classmethod
-    def poll(cls, context):
-        # When used in the tool header, this is explicitly included next to the XYZ symmetry buttons.
-        return (context.region.type != 'TOOL_HEADER')
-
-    def draw(self, context):
-        layout = self.layout
-        tool_settings = context.tool_settings
-        wpaint = tool_settings.weight_paint
-        draw_vpaint_symmetry(layout, wpaint)
-
-
-class VIEW3D_PT_tools_weightpaint_symmetry_for_topbar(Panel):
-    bl_space_type = 'TOPBAR'
-    bl_region_type = 'HEADER'
-    bl_label = "Symmetry"
-
-    draw = VIEW3D_PT_tools_weightpaint_symmetry.draw
-
-
 # TODO, move to space_view3d.py
 class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
     bl_context = ".weightpaint"
@@ -2282,8 +2256,6 @@ classes = (
     VIEW3D_PT_sculpt_options,
     VIEW3D_PT_sculpt_options_unified,
     VIEW3D_PT_sculpt_options_gravity,
-    VIEW3D_PT_tools_weightpaint_symmetry,
-    VIEW3D_PT_tools_weightpaint_symmetry_for_topbar,
     VIEW3D_PT_tools_weightpaint_options,
     VIEW3D_PT_tools_weightpaint_options_unified,
     VIEW3D_PT_tools_vertexpaint_symmetry,