[Bf-blender-cvs] [abbe7c9e6ae] lanpr-under-gp: LineArt: Modifier UI cleanup.

[YimingWu]

Commit: abbe7c9e6ae2001c9164a2f32daafc21d6bcf059
Author: YimingWu
Date:   Sat Oct 31 16:48:23 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBabbe7c9e6ae2001c9164a2f32daafc21d6bcf059

LineArt: Modifier UI cleanup.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index b41c219661a..abeb5b3fc43 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -376,7 +376,7 @@ static void panel_draw(const bContext *C, Panel *panel)
   gpencil_modifier_panel_end(layout, ptr);
 }
 
-static void occlusion_panel_draw(const bContext *C, Panel *panel)
+static void style_panel_draw(const bContext *C, Panel *panel)
 {
   PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
 
@@ -385,9 +385,19 @@ static void occlusion_panel_draw(const bContext *C, Panel *panel)
   uiLayoutSetPropSep(layout, true);
 
   uiItemR(layout, ptr, "thickness", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
   uiItemR(layout, ptr, "opacity", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
   uiItemR(layout, ptr, "pre_sample_length", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+}
+
+static void occlusion_panel_draw(const bContext *C, Panel *panel)
+{
+  PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
+
+  uiLayout *layout = panel->layout;
+
+  uiLayoutSetPropSep(layout, true);
 
   bool use_multiple_levels = RNA_boolean_get(ptr, "use_multiple_levels");
   bool use_transparency = RNA_boolean_get(ptr, "use_transparency");
@@ -434,6 +444,7 @@ static void vgroup_panel_draw(const bContext *C, Panel *panel)
   uiLayoutSetPropSep(layout, true);
 
   row = uiLayoutRow(layout, true);
+  uiItemR(row, ptr, "source_vertex_group", 0, "Filter Source", ICON_GROUP_VERTEX);
   uiItemR(row, ptr, "invert_source_vertex_group", UI_ITEM_R_TOGGLE, "", ICON_ARROW_LEFTRIGHT);
 
   uiItemR(layout, ptr, "match_output_vertex_group", 0, NULL, ICON_NONE);
@@ -444,7 +455,6 @@ static void vgroup_panel_draw(const bContext *C, Panel *panel)
   }
 
   uiItemR(layout, ptr, "soft_selection", 0, NULL, ICON_NONE);
-  uiItemR(row, ptr, "source_vertex_group", 0, "Filter source", ICON_GROUP_VERTEX);
 }
 
 static void panelRegister(ARegionType *region_type)
@@ -452,6 +462,8 @@ static void panelRegister(ARegionType *region_type)
   PanelType *panel_type = gpencil_modifier_panel_register(
       region_type, eGpencilModifierType_Lineart, panel_draw);
 
+  gpencil_modifier_subpanel_register(
+      region_type, "style", "Style", NULL, style_panel_draw, panel_type);
   gpencil_modifier_subpanel_register(
       region_type, "occlusion", "Occlusion", NULL, occlusion_panel_draw, panel_type);
   gpencil_modifier_subpanel_register(