[Bf-blender-cvs] [20bdf114a55] greasepencil-object: WIP: Add Brush drawing settings to topbar

Antonio Vazquez noreply at git.blender.org
Tue Jul 10 19:37:07 CEST 2018


Commit: 20bdf114a55dc5d0720ff832eab4f06506a7a6f8
Author: Antonio Vazquez
Date:   Tue Jul 10 19:36:58 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB20bdf114a55dc5d0720ff832eab4f06506a7a6f8

WIP: Add Brush drawing settings to topbar

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_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 1b5e6fb6eef..75e5a5737a7 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -63,6 +63,9 @@ def generate_from_brushes_gpencil(
     brush_category_attr,
     brush_category_layout,
 ):
+    def draw_settings(context, layout, tool):
+        _defs_gpencil_paint.draw_settings_common(context, layout, tool)
+
     # Categories
     brush_categories = {}
     for brush in context.blend_data.brushes:
@@ -77,6 +80,7 @@ def generate_from_brushes_gpencil(
                         data_block=name,
                         widget=None,
                         operator="gpencil.draw",
+                        draw_settings=draw_settings,
                     )
                 )
             )
@@ -978,6 +982,23 @@ class _defs_uv_select:
         )
 
 class _defs_gpencil_paint:
+    @classmethod
+    def draw_settings_common(cls, context, layout, tool):
+        ob = context.active_object
+        if ob and ob.mode == 'GPENCIL_PAINT':
+            brush = context.active_gpencil_brush
+            gp_settings = brush.gpencil_settings
+
+            row = layout.row(align=True)
+            row.prop(brush, "size", text="Radius")
+            row.prop(gp_settings, "use_pressure", text="", icon='STYLUS_PRESSURE')
+            row = layout.row(align=True)
+            row.prop(gp_settings, "pen_strength", slider=True)
+            row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
+
+            row = layout.row(align=True)
+            row.template_ID(gp_settings, "material")
+
     @staticmethod
     def generate_from_brushes(context):
         return generate_from_brushes_gpencil(



More information about the Bf-blender-cvs mailing list