[Bf-blender-cvs] [664865680a6] blender2.8: GP: More changes to sculpt panels and topbar
Antonioya
noreply at git.blender.org
Fri Sep 21 22:50:28 CEST 2018
Commit: 664865680a6356da3860821f27dcbab702f00863
Author: Antonioya
Date: Fri Sep 21 22:50:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB664865680a6356da3860821f27dcbab702f00863
GP: More changes to sculpt panels and topbar
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 3020f71d1e7..e7521f8b3d0 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -265,7 +265,6 @@ class GreasePencilStrokeSculptPanel:
col.row().prop(brush, "direction", expand=True)
-
class GreasePencilSculptOptionsPanel:
bl_label = "Sculpt Strokes"
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index d249a9aa966..994e3e990bf 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1392,6 +1392,7 @@ class _defs_gpencil_sculpt:
if ob and ob.mode == 'GPENCIL_SCULPT':
ts = context.tool_settings
settings = ts.gpencil_sculpt
+ tool = settings.tool
brush = settings.brush
layout.prop(brush, "size", slider=True)
@@ -1399,6 +1400,11 @@ class _defs_gpencil_sculpt:
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
+
+ if tool in {'THICKNESS', 'PINCH', 'TWIST'}:
+ row.separator()
+ row.prop(brush, "direction", expand=True, text="")
+
row.separator()
row.prop(ts.gpencil_sculpt, "use_select_mask", text="")
More information about the Bf-blender-cvs
mailing list