[Bf-blender-cvs] [705b0631b3e] greasepencil-object: UI: Harmonize Toolbar parameters
Antonio Vazquez
noreply at git.blender.org
Tue Jul 24 12:54:07 CEST 2018
Commit: 705b0631b3e328636ee4af260ae8962f105e0f5e
Author: Antonio Vazquez
Date: Tue Jul 24 12:54:01 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB705b0631b3e328636ee4af260ae8962f105e0f5e
UI: Harmonize Toolbar parameters
Some parameters have been moved to toolbar and removed from header.
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
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_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2a129c4ffb7..17caf693fd7 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1043,6 +1043,7 @@ class _defs_gpencil_paint:
if ob and ob.mode == 'GPENCIL_PAINT':
brush = context.active_gpencil_brush
gp_settings = brush.gpencil_settings
+ tool_settings= context.tool_settings
if gp_settings.gpencil_brush_type == 'ERASE':
row = layout.row()
@@ -1055,6 +1056,11 @@ class _defs_gpencil_paint:
_defs_gpencil_paint.draw_color_selector(context, layout)
+ row.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
+ row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='')
+ if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
+ row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
+
row = layout.row(align=True)
row.prop(gp_settings, "gpencil_fill_draw_mode", text="")
row.prop(gp_settings, "gpencil_fill_show_boundary", text="", icon='GRID')
@@ -1069,6 +1075,12 @@ class _defs_gpencil_paint:
_defs_gpencil_paint.draw_color_selector(context, layout)
+ row.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
+ row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='')
+ if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
+ row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
+
+
@staticmethod
def generate_from_brushes(context):
return generate_from_brushes_ex(
@@ -1095,7 +1107,8 @@ class _defs_gpencil_sculpt:
def draw_settings_common(cls, context, layout, tool):
ob = context.active_object
if ob and ob.mode == 'GPENCIL_SCULPT':
- settings = context.tool_settings.gpencil_sculpt
+ ts = context.tool_settings
+ settings = ts.gpencil_sculpt
brush = settings.brush
layout.prop(brush, "size", slider=True)
@@ -1104,6 +1117,11 @@ class _defs_gpencil_sculpt:
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
+ row = layout.row()
+ row.prop(ts.gpencil_sculpt, "lockaxis", text='')
+
+ row.prop(ts.gpencil_sculpt, "use_select_mask", text="")
+
@ToolDef.from_fn
def smooth():
def draw_settings(context, layout, tool):
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 96ef2e51e60..b37c342923b 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -128,6 +128,8 @@ class TOPBAR_HT_lower_bar(Header):
pass
elif mode == 'PARTICLE':
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="")
+ elif mode == 'GPENCIL_PAINT':
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_paint", category="")
def draw_center(self, context):
pass
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index ca320225387..ad03defcc99 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -78,26 +78,9 @@ class VIEW3D_HT_header(Header):
row.operator("pose.paste", text="", icon='PASTEFLIPDOWN').flipped = True
# Grease Pencil
- # GPXX this is a hack while we merge to keep all running
- # XXX: Should these buttons show up in Object Mode at all?
if obj and obj.type == 'GPENCIL' and context.gpencil_data:
gpd = context.gpencil_data
- if gpd.is_stroke_paint_mode:
- row = layout.row()
- row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='')
- if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
- row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
-
- if tool_settings.gpencil_stroke_placement_view3d in ('SURFACE', 'STROKE'):
- row.prop(tool_settings, "use_gpencil_stroke_endpoints")
-
- brush = context.active_gpencil_brush
- if brush is not None:
- gp_settings = brush.gpencil_settings
- if gp_settings.gpencil_brush_type != 'ERASE':
- row.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
-
if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
row = layout.row(align=True)
row.prop(gpd, "use_multiedit", text="", icon="FORCE_HARMONIC")
@@ -109,26 +92,14 @@ class VIEW3D_HT_header(Header):
text="Multiframe"
)
- if gpd.is_stroke_sculpt_mode:
- settings = context.tool_settings.gpencil_sculpt
- if settings.tool in ('GRAB', 'PUSH', 'TWIST', 'PINCH', 'RANDOMIZE'):
- row = layout.row()
- row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
-
if gpd.use_stroke_edit_mode:
row = layout.row(align=True)
row.operator("gpencil.copy", text="", icon='COPYDOWN')
row.operator("gpencil.paste", text="", icon='PASTEDOWN')
- if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
row = layout.row(align=True)
row.prop(tool_settings.gpencil_sculpt, "use_select_mask", text="")
- # GPXX: Disabled. To be removed when new preview works
- # if gpd.is_stroke_paint_mode:
- # row = layout.row(align=True)
- # row.operator("gpencil.colorpick", text="Colors", icon="GROUP_VCOL")
-
VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
layout.separator_spacer()
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 051599f4ab6..049d7794374 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1350,7 +1350,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
# Grease Pencil drawing brushes
class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
- bl_label = "Drawing Brushes"
+ bl_label = "Brush"
@classmethod
def poll(cls, context):
@@ -1564,7 +1564,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
# Grease Pencil drawingcurves
class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
- bl_label = "Brush Curves"
+ bl_label = "Curves"
bl_options = {'DEFAULT_CLOSED'}
@staticmethod
@@ -1730,17 +1730,17 @@ class VIEW3D_PT_tools_grease_pencil_weight_tools(Panel):
# Grease Pencil Brush Appeareance (one for each mode)
class VIEW3D_PT_tools_grease_pencil_paint_appearance(GreasePencilAppearancePanel, View3DPanel, Panel):
bl_context = ".greasepencil_paint"
- bl_label = "Brush Appearance"
+ bl_label = "Appearance"
class VIEW3D_PT_tools_grease_pencil_sculpt_appearance(GreasePencilAppearancePanel, View3DPanel, Panel):
bl_context = ".greasepencil_sculpt"
- bl_label = "Brush Appearance"
+ bl_label = "Appearance"
class VIEW3D_PT_tools_grease_pencil_weight_appearance(GreasePencilAppearancePanel, View3DPanel, Panel):
bl_context = ".greasepencil_weight"
- bl_label = "Brush Appearance"
+ bl_label = "Appearance"
# Grease Pencil Animation Tools
class VIEW3D_PT_tools_grease_pencil_animation(GreasePencilAnimationPanel, Panel):
@@ -1779,14 +1779,13 @@ classes = (
VIEW3D_MT_tools_projectpaint_stencil,
VIEW3D_PT_tools_particlemode,
- # FIXME: After GP Branch merge, fix up the UI to work with toolbar/topbar
- # some panels have been moved to toolbar already
VIEW3D_PT_tools_grease_pencil_brush,
VIEW3D_PT_tools_grease_pencil_brush_option,
VIEW3D_PT_tools_grease_pencil_brush_settings,
VIEW3D_PT_tools_grease_pencil_brush_stabilizer,
VIEW3D_PT_tools_grease_pencil_brush_random,
VIEW3D_PT_tools_grease_pencil_brushcurves,
+ # GPXX: review
# VIEW3D_PT_tools_grease_pencil_shapes,
VIEW3D_PT_tools_grease_pencil_edit,
VIEW3D_PT_tools_grease_pencil_sculpt,
@@ -1796,6 +1795,7 @@ classes = (
VIEW3D_PT_tools_grease_pencil_sculpt_appearance,
VIEW3D_PT_tools_grease_pencil_weight_appearance,
VIEW3D_PT_tools_grease_pencil_interpolate,
+ # GPXX: review
#VIEW3D_PT_tools_grease_pencil_animation,
)
More information about the Bf-blender-cvs
mailing list