[Bf-blender-cvs] [10d948469c9] greasepencil-object: UI: Some cleanup of properties panels (WIP)

Antonio Vazquez noreply at git.blender.org
Thu Jun 14 20:14:39 CEST 2018


Commit: 10d948469c913d8febbe8abeef2724e182497879
Author: Antonio Vazquez
Date:   Thu Jun 14 20:14:33 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB10d948469c913d8febbe8abeef2724e182497879

UI: Some cleanup of properties panels (WIP)

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d_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 2d09296b00c..3ae03708e25 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -249,6 +249,8 @@ class GreasePencilStrokeSculptPanel:
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         gpd = context.gpencil_data
         settings = context.tool_settings.gpencil_sculpt
         tool = settings.tool
@@ -313,6 +315,8 @@ class GreasePencilAppearancePanel:
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         workspace = context.workspace
 
         if context.active_object.mode == 'GPENCIL_PAINT':
@@ -320,16 +324,12 @@ class GreasePencilAppearancePanel:
             gp_settings = brush.gpencil_settings
 
             col = layout.column(align=True)
-            col.label("Brush Type:")
-            col.prop(gp_settings, "gpencil_brush_type", text="")
+            col.prop(gp_settings, "gpencil_brush_type", text="Brush Type")
 
-            col = layout.column(align=True)
-            col.label("Icon:")
             sub = col.column(align=True)
             sub.enabled = not brush.use_custom_icon
-            sub.prop(gp_settings, "gp_icon", text="")
+            sub.prop(gp_settings, "gp_icon", text="Icon")
 
-            col.separator()
             col.prop(brush, "use_custom_icon")
             sub = col.column()
             sub.active = brush.use_custom_icon
@@ -366,6 +366,7 @@ class GreasePencilAnimationPanel:
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
 
         col = layout.column(align=True)
         col.operator("gpencil.blank_frame_add", icon='NEW')
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 8d69761c8be..7ba753d1686 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1373,6 +1373,8 @@ class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         ts = context.scene.tool_settings
         settings = ts.gpencil_paint
 
@@ -1448,6 +1450,8 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         brush = context.active_gpencil_brush
         gp_settings = brush.gpencil_settings
 
@@ -1459,9 +1463,8 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
             col.prop(gp_settings, "active_smooth_factor")
             col.separator()
 
-            row = col.row(align=True)
-            row.prop(gp_settings, "angle", slider=True)
-            row.prop(gp_settings, "angle_factor", text="Factor", slider=True)
+            col.prop(gp_settings, "angle", slider=True)
+            col.prop(gp_settings, "angle_factor", text="Factor", slider=True)
             col.separator()
 
             if gp_settings.gpencil_brush_type == 'DRAW':
@@ -1513,6 +1516,8 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         brush = context.active_gpencil_brush
         gp_settings = brush.gpencil_settings
 
@@ -1542,6 +1547,7 @@ class VIEW3D_PT_tools_grease_pencil_shapes(Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
 
         col = layout.column(align=True)
         col.operator("gpencil.primitive", text="Line", icon='IPO_CONSTANT').type = 'LINE'
@@ -1620,6 +1626,8 @@ class VIEW3D_PT_tools_grease_pencil_weight_paint(View3DPanel, Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         gpd = context.gpencil_data
         settings = context.tool_settings.gpencil_sculpt
         tool = settings.tool
@@ -1656,6 +1664,8 @@ class VIEW3D_PT_tools_grease_pencil_weight_tools(Panel):
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
+
         col = layout.column()
         col.operator("gpencil.vertex_group_invert", text="Invert")
         col.operator("gpencil.vertex_group_smooth", text="Smooth")



More information about the Bf-blender-cvs mailing list