[Bf-blender-cvs] [31ae1462f23] master: GPencil: Move Holdout parameter below Base Color

[Antonio Vazquez]

Commit: 31ae1462f23ffa083657d7b96c8b1377bbeafca0
Author: Antonio Vazquez
Date:   Sat Sep 19 19:20:04 2020 +0200
Branches: master
https://developer.blender.org/rB31ae1462f23ffa083657d7b96c8b1377bbeafca0

GPencil: Move Holdout parameter below Base Color

It's better keep this parameter here instead to put it at the end of the panel.

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

M	release/scripts/startup/bl_ui/properties_material_gpencil.py

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index a1af447d402..da71afdddc2 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -148,8 +148,8 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel):
 
             col.prop(gpcolor, "stroke_style", text="Style")
 
-            row = col.row()
-            row.prop(gpcolor, "color", text="Base Color")
+            col.prop(gpcolor, "color", text="Base Color")
+            col.prop(gpcolor, "use_stroke_holdout")
 
             if gpcolor.stroke_style == 'TEXTURE':
                 row = col.row()
@@ -169,8 +169,6 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel):
             if gpcolor.mode == 'LINE':
                 col.prop(gpcolor, "use_overlap_strokes")
 
-            col.prop(gpcolor, "use_stroke_holdout")
-
 
 class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
     bl_label = "Fill"
@@ -196,11 +194,13 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
 
         if gpcolor.fill_style == 'SOLID':
             col.prop(gpcolor, "fill_color", text="Base Color")
+            col.prop(gpcolor, "use_fill_holdout")
 
         elif gpcolor.fill_style == 'GRADIENT':
             col.prop(gpcolor, "gradient_type")
 
             col.prop(gpcolor, "fill_color", text="Base Color")
+            col.prop(gpcolor, "use_fill_holdout")
             col.prop(gpcolor, "mix_color", text="Secondary Color")
             col.prop(gpcolor, "mix_factor", text="Blend", slider=True)
             col.prop(gpcolor, "flip", text="Flip Colors")
@@ -215,6 +215,7 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
 
         elif gpcolor.fill_style == 'TEXTURE':
             col.prop(gpcolor, "fill_color", text="Base Color")
+            col.prop(gpcolor, "use_fill_holdout")
 
             col.template_ID(gpcolor, "fill_image", open="image.open")
 
@@ -225,8 +226,6 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
             col.prop(gpcolor, "texture_scale", text="Scale")
             col.prop(gpcolor, "texture_clamp", text="Clip Image")
 
-        col.prop(gpcolor, "use_fill_holdout")
-
 
 class MATERIAL_PT_gpencil_preview(GPMaterialButtonsPanel, Panel):
     bl_label = "Preview"