kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: move gpencil paint into topbar only layout

Browse Source 
Tool properties were duplicating UI elements.
This commit is contained in:
Campbell Barton 2018-11-13 20:59:25 +11:00
parent 4503c96a17
commit f4d4f50212
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@ -1384,22 +1384,6 @@ class _defs_gpencil_edit:
class _defs_gpencil_sculpt:
def draw_settings_common(context, layout, tool):
tool_settings = context.tool_settings
settings = tool_settings.gpencil_sculpt
tool = settings.sculpt_tool
brush = settings.brush
layout.prop(brush, "size", slider=True)
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
row.separator()
row.prop(brush, "direction", expand=True, text="")
@staticmethod
def generate_from_brushes(context):
return generate_from_enum_ex(
@ -1407,24 +1391,11 @@ class _defs_gpencil_sculpt:
icon_prefix="ops.gpencil.sculpt_",
type=bpy.types.GPencilSculptSettings,
attr="sculpt_tool",
tooldef_keywords={
"draw_settings": _defs_gpencil_sculpt.draw_settings_common,
},
)
class _defs_gpencil_weight:
def draw_settings_common(context, layout, tool):
settings = context.tool_settings.gpencil_sculpt
brush = settings.brush
layout.prop(brush, "size", slider=True)
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
@staticmethod
def generate_from_brushes(context):
return generate_from_enum_ex(
@ -1432,9 +1403,6 @@ class _defs_gpencil_weight:
icon_prefix="ops.gpencil.sculpt_",
type=bpy.types.GPencilSculptSettings,
attr="weight_tool",
tooldef_keywords={
"draw_settings": _defs_gpencil_weight.draw_settings_common,
},
)

33
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -368,6 +368,39 @@ class _draw_left_context_mode:
draw_color_selector()
@staticmethod
def GPENCIL_SCULPT(context, layout, tool):
if (tool is None) or (not tool.has_datablock):
return
tool_settings = context.tool_settings
settings = tool_settings.gpencil_sculpt
tool = settings.sculpt_tool
brush = settings.brush
layout.prop(brush, "size", slider=True)
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
row.separator()
row.prop(brush, "direction", expand=True, text="")
@staticmethod
def GPENCIL_WEIGHT(context, layout, tool):
if (tool is None) or (not tool.has_datablock):
return
tool_settings = context.tool_settings
settings = tool_settings.gpencil_sculpt
brush = settings.brush
layout.prop(brush, "size", slider=True)
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
@staticmethod
def PARTICLE(context, layout, tool):
# See: 'VIEW3D_PT_tools_brush', basically a duplicate