Skip to content
Snippets Groups Projects
Commit c9fba919 authored by Ryan Inch's avatar Ryan Inch
Browse files

space_view3d_brush_menus: Fix T96937 and make symmetry work consistently from all applicable modes.

parent baa58141
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ bl_info = { ...@@ -6,7 +6,7 @@ bl_info = {
"name": "Dynamic Brush Menus", "name": "Dynamic Brush Menus",
"description": "Fast access to brushes & tools in Sculpt and Paint Modes", "description": "Fast access to brushes & tools in Sculpt and Paint Modes",
"author": "Ryan Inch (Imaginer)", "author": "Ryan Inch (Imaginer)",
"version": (1, 1, 8), "version": (1, 1, 9),
"blender": (2, 80, 0), "blender": (2, 80, 0),
"location": "Spacebar in Sculpt/Paint Modes", "location": "Spacebar in Sculpt/Paint Modes",
"warning": '', "warning": '',
......
...@@ -105,6 +105,8 @@ class BrushOptionsMenu(Menu): ...@@ -105,6 +105,8 @@ class BrushOptionsMenu(Menu):
layout.row().menu("VIEW3D_MT_sv3_stroke_options") layout.row().menu("VIEW3D_MT_sv3_stroke_options")
layout.row().menu("VIEW3D_MT_sv3_brush_curve_menu") layout.row().menu("VIEW3D_MT_sv3_brush_curve_menu")
layout.row().menu("VIEW3D_MT_sv3_master_symmetry_menu")
def texpaint(self, mode, layout, context): def texpaint(self, mode, layout, context):
toolsettings = context.tool_settings.image_paint toolsettings = context.tool_settings.image_paint
...@@ -194,6 +196,8 @@ class BrushOptionsMenu(Menu): ...@@ -194,6 +196,8 @@ class BrushOptionsMenu(Menu):
layout.row().menu(ParticlePuffMenu.bl_idname) layout.row().menu(ParticlePuffMenu.bl_idname)
layout.row().prop(particle_edit.brush, "use_puff_volume", toggle=True) layout.row().prop(particle_edit.brush, "use_puff_volume", toggle=True)
layout.row().menu("VIEW3D_MT_sv3_master_symmetry_menu")
class BrushRadiusMenu(Menu): class BrushRadiusMenu(Menu):
bl_label = "Radius" bl_label = "Radius"
......
...@@ -13,24 +13,33 @@ class MasterSymmetryMenu(Menu): ...@@ -13,24 +13,33 @@ class MasterSymmetryMenu(Menu):
def poll(self, context): def poll(self, context):
return utils_core.get_mode() in ( return utils_core.get_mode() in (
'SCULPT', 'SCULPT',
'TEXTURE_PAINT' 'VERTEX_PAINT',
'WEIGHT_PAINT',
'TEXTURE_PAINT',
'PARTICLE_EDIT',
) )
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
if utils_core.get_mode() == 'TEXTURE_PAINT': if utils_core.get_mode() == 'PARTICLE_EDIT':
layout.row().prop(context.tool_settings.image_paint, layout.row().prop(context.active_object.data, "use_mirror_x",
"use_symmetry_x", toggle=True) text="Mirror X", toggle=True)
layout.row().prop(context.tool_settings.image_paint,
"use_symmetry_y", toggle=True) elif utils_core.get_mode() == 'TEXTURE_PAINT':
layout.row().prop(context.tool_settings.image_paint, layout.row().prop(context.active_object, "use_mesh_mirror_x",
"use_symmetry_z", toggle=True) text="Symmetry X", toggle=True)
layout.row().prop(context.active_object, "use_mesh_mirror_y",
text="Symmetry Y", toggle=True)
layout.row().prop(context.active_object, "use_mesh_mirror_z",
text="Symmetry Z", toggle=True)
else: else:
layout.row().menu(SymmetryMenu.bl_idname) layout.row().menu(SymmetryMenu.bl_idname)
layout.row().menu(SymmetryRadialMenu.bl_idname) layout.row().menu(SymmetryRadialMenu.bl_idname)
layout.row().prop(context.tool_settings.sculpt,
"use_symmetry_feather", toggle=True) if utils_core.get_mode() == 'SCULPT':
layout.row().prop(context.tool_settings.sculpt, "use_symmetry_feather",
toggle=True)
class SymmetryMenu(Menu): class SymmetryMenu(Menu):
...@@ -43,12 +52,12 @@ class SymmetryMenu(Menu): ...@@ -43,12 +52,12 @@ class SymmetryMenu(Menu):
layout.row().label(text="Symmetry") layout.row().label(text="Symmetry")
layout.row().separator() layout.row().separator()
layout.row().prop(context.tool_settings.sculpt, layout.row().prop(context.active_object, "use_mesh_mirror_x",
"use_symmetry_x", toggle=True) text="Symmetry X", toggle=True)
layout.row().prop(context.tool_settings.sculpt, layout.row().prop(context.active_object, "use_mesh_mirror_y",
"use_symmetry_y", toggle=True) text="Symmetry Y", toggle=True)
layout.row().prop(context.tool_settings.sculpt, layout.row().prop(context.active_object, "use_mesh_mirror_z",
"use_symmetry_z", toggle=True) text="Symmetry Z", toggle=True)
class SymmetryRadialMenu(Menu): class SymmetryRadialMenu(Menu):
...@@ -61,8 +70,9 @@ class SymmetryRadialMenu(Menu): ...@@ -61,8 +70,9 @@ class SymmetryRadialMenu(Menu):
layout.row().label(text="Radial") layout.row().label(text="Radial")
layout.row().separator() layout.row().separator()
layout.column().prop(context.tool_settings.sculpt, mode_tool_settings = getattr(context.tool_settings, utils_core.get_mode().lower())
"radial_symmetry", text="", slider=True)
layout.column().prop(mode_tool_settings, "radial_symmetry", text="", slider=True)
classes = ( classes = (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment