[Bf-blender-cvs] [92cdf9ad296] greasepencil-object: GPencil: Move Boundary parameter to popover

[Antonio Vazquez]

Commit: 92cdf9ad296e18aa274b2a66a92093029735824c
Author: Antonio Vazquez
Date:   Thu Nov 7 19:54:17 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB92cdf9ad296e18aa274b2a66a92093029735824c

GPencil: Move Boundary parameter to popover

The topbar is too populate.

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

M	release/scripts/startup/bl_ui/properties_paint_common.py
M	release/scripts/startup/bl_ui/space_topbar.py

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

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 71b84945c8b..b7ea36717ac 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -392,9 +392,6 @@ def brush_basic_gpencil_paint_settings(layout, _context, brush, tool, *, compact
         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')
         # Fill options
         if is_toolbar:
             settings = _context.tool_settings.gpencil_sculpt
@@ -405,6 +402,9 @@ def brush_basic_gpencil_paint_settings(layout, _context, brush, tool, *, compact
                 text="Fill Options",
             )
         else:
+            row = layout.row(align=True)
+            row.prop(gp_settings, "fill_draw_mode", text="Boundary")
+            row.prop(gp_settings, "show_fill_boundary", text="", icon='GRID')
             row = layout.row(align=True)
             row.prop(gp_settings, "fill_factor", text="Resolution")
             if gp_settings.fill_draw_mode != 'STROKE':
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index fef0e095099..80da131ad53 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -670,6 +670,7 @@ class TOPBAR_PT_gpencil_fill(Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'HEADER'
     bl_label = "Advanced"
+    bl_ui_units_x = 13
 
     def draw(self, context):
         paint = context.tool_settings.gpencil_paint
@@ -678,6 +679,10 @@ class TOPBAR_PT_gpencil_fill(Panel):
 
         layout = self.layout
         # Fill
+        row = layout.row(align=True)
+        row.prop(gp_settings, "fill_draw_mode", text="Boundary")
+        row.prop(gp_settings, "show_fill_boundary", text="", icon='GRID')
+
         row = layout.row(align=True)
         row.prop(gp_settings, "fill_factor", text="Resolution")
         if gp_settings.fill_draw_mode != 'STROKE':