blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

GPencil: Fix brush panels after UI reorganization 

With the brush reorganization included in D5928, the brush panels had covered the topbar and make impossible to use the drawing tools.

Now, the options are grouped in Stroke popover, similar to Sculpt.

Also fixed some missing or wrong texts.
This commit is contained in:
Antonio Vazquez 2019-12-17 17:14:05 +01:00
parent 5f79e0d8f7
commit 7267d1fe30
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -233,14 +233,14 @@ class GreasePencilDisplayPanel:
col.active = brush.use_cursor
if tool in {'THICKNESS', 'STRENGTH'}:
col.prop(brush, "cursor_color_add", text="Add Cursor Color")
col.prop(brush, "cursor_color_sub", text="Subtract Cursor Color")
col.prop(brush, "cursor_color_add", text="Cursor Color")
col.prop(brush, "cursor_color_sub", text="Inverse Cursor Color")
elif tool == 'PINCH':
col.prop(brush, "cursor_color_add", text="Pinch Cursor Color")
col.prop(brush, "cursor_color_sub", text="Inflate Cursor Color")
col.prop(brush, "cursor_color_add", text="Cursor Color")
col.prop(brush, "cursor_color_sub", text="Inverse Cursor Color")
elif tool == 'TWIST':
col.prop(brush, "cursor_color_add", text="CCW Cursor Color")
col.prop(brush, "cursor_color_sub", text="CW Cursor Color")
col.prop(brush, "cursor_color_add", text="Cursor Color")
col.prop(brush, "cursor_color_sub", text="Inverse Cursor Color")
else:
col.prop(brush, "cursor_color_add", text="Cursor Color")

5
release/scripts/startup/bl_ui/properties_paint_common.py
View File

@ -1007,7 +1007,7 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False)
row.prop(gp_settings, "eraser_thickness_factor")
row = layout.row(align=True)
row.prop(gp_settings, "use_cursor", text="Show Brush")
row.prop(gp_settings, "use_cursor", text="Display Cursor")
# FIXME: tools must use their own UI drawing!
elif brush.gpencil_tool == 'FILL':
@ -1017,9 +1017,6 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False)
row.prop(brush, "size", text="Thickness")
row = layout.row(align=True)
row.prop(gp_settings, "fill_simplify_level", text="Simplify")
row = layout.row(align=True)
row.prop(gp_settings, "fill_draw_mode", text="Boundary")
row.prop(gp_settings, "show_fill_boundary", text="", icon='GRID')
else: # brush.gpencil_tool == 'DRAW':
row = layout.row(align=True)

3
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -122,8 +122,7 @@ class VIEW3D_HT_tool_header(Header):
layout.popover("VIEW3D_PT_tools_grease_pencil_brush_advanced")
if brush.gpencil_tool != 'FILL':
layout.popover("VIEW3D_PT_tools_grease_pencil_brush_stabilizer")
layout.popover("VIEW3D_PT_tools_grease_pencil_brush_random")
layout.popover("VIEW3D_PT_tools_grease_pencil_brush_stroke")
layout.popover("VIEW3D_PT_tools_grease_pencil_brushcurves")
layout.popover("VIEW3D_PT_tools_grease_pencil_paint_appearance")

30
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -1379,8 +1379,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_select(Panel, View3DPanel, GreasePenci
if brush.use_custom_icon:
layout.row().prop(brush, "icon_filepath", text="")
else:
layout.row().prop(gp_settings, "gp_icon", text="Icon")
class VIEW3D_PT_tools_grease_pencil_brush_settings(Panel, View3DPanel, GreasePencilPanel):
@ -1470,15 +1468,34 @@ class VIEW3D_PT_tools_grease_pencil_brush_advanced(View3DPanel, Panel):
subcol.prop(gp_settings, "gradient_shape")
elif brush.gpencil_tool == 'FILL':
row = col.row(align=True)
row.prop(gp_settings, "fill_draw_mode", text="Boundary")
row.prop(gp_settings, "show_fill_boundary", text="", icon='GRID')
col.separator()
col.prop(gp_settings, "fill_factor", text="Resolution")
if gp_settings.fill_draw_mode != 'STROKE':
col.prop(gp_settings, "show_fill", text="Ignore Transparent Strokes")
col.prop(gp_settings, "fill_threshold", text="Threshold")
class VIEW3D_PT_tools_grease_pencil_brush_stroke(Panel, View3DPanel):
bl_context = ".greasepencil_paint"
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
bl_label = "Stroke"
bl_category = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@classmethod
def poll(cls, context):
brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool == 'DRAW'
def draw(self, context):
layout = self.layout
class VIEW3D_PT_tools_grease_pencil_brush_stabilizer(Panel, View3DPanel):
bl_context = ".greasepencil_paint"
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
bl_label = "Stabilize Stroke"
bl_category = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@ -1518,7 +1535,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_stabilizer(Panel, View3DPanel):
class VIEW3D_PT_tools_grease_pencil_brush_post_processing(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
bl_label = "Post-Processing"
bl_category = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@ -1573,7 +1590,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_post_processing(View3DPanel, Panel):
class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
bl_label = "Randomize"
bl_category = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@ -1903,9 +1920,10 @@ classes = (
VIEW3D_PT_tools_grease_pencil_brush_select,
VIEW3D_PT_tools_grease_pencil_brush_settings,
VIEW3D_PT_tools_grease_pencil_brush_advanced,
VIEW3D_PT_tools_grease_pencil_brush_stroke,
VIEW3D_PT_tools_grease_pencil_brush_post_processing,
VIEW3D_PT_tools_grease_pencil_brush_stabilizer,
VIEW3D_PT_tools_grease_pencil_brush_random,
VIEW3D_PT_tools_grease_pencil_brush_stabilizer,
VIEW3D_PT_tools_grease_pencil_brushcurves,
VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity,
VIEW3D_PT_tools_grease_pencil_brushcurves_strength,