[Bf-blender-cvs] [70867ff74ea] lanpr-under-gp: LineArt: Vertex group input will select all when filter is empty

[YimingWu]

Commit: 70867ff74ead6167844b51304c429493f11c0078
Author: YimingWu
Date:   Mon Oct 19 15:12:20 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB70867ff74ead6167844b51304c429493f11c0078

LineArt: Vertex group input will select all when filter is empty

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

M	source/blender/editors/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 727795a13c3..4223cd45d34 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -4195,7 +4195,7 @@ void ED_lineart_gpencil_generate_from_chain(Depsgraph *depsgraph,
           continue;
         }
         LISTBASE_FOREACH (bDeformGroup *, db, &eval_ob->defbase) {
-          if (strstr(db->name, source_vgname) == db->name) {
+          if ((!source_vgname) || strstr(db->name, source_vgname) == db->name) {
             if (match_output) {
               gpdg = BKE_object_defgroup_name_index(gpencil_object, db->name);
               if (gpdg < 0) {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index b79b444ab15..50840cc5501 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -433,10 +433,7 @@ static void vgroup_panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiItemR(layout, ptr, "soft_selection", 0, NULL, ICON_NONE);
-
   row = uiLayoutRow(layout, true);
-  uiItemR(row, ptr, "source_vertex_group", 0, "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);
@@ -445,6 +442,9 @@ static void vgroup_panel_draw(const bContext *C, Panel *panel)
   if (!match_output) {
     uiItemPointerR(layout, ptr, "vertex_group", &ob_ptr, "vertex_groups", "Target", ICON_NONE);
   }
+
+  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)
@@ -455,7 +455,7 @@ static void panelRegister(ARegionType *region_type)
   gpencil_modifier_subpanel_register(
       region_type, "occlusion", "Occlusion", NULL, occlusion_panel_draw, panel_type);
   gpencil_modifier_subpanel_register(
-      region_type, "vgroup", "Vertex Group", NULL, vgroup_panel_draw, panel_type);
+      region_type, "vgroup", "Vertex Weight Transfer", NULL, vgroup_panel_draw, panel_type);
 }
 
 GpencilModifierTypeInfo modifierType_Gpencil_Lineart = {
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index b1cccac147c..75c6a688ba9 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2385,9 +2385,10 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna)
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "source_vertex_group", PROP_STRING, PROP_NONE);
-  RNA_def_property_ui_text(prop,
-                           "Source Vertex Group",
-                           "Matches the beginning of names of vertex groups from mesh objects");
+  RNA_def_property_ui_text(
+      prop,
+      "Source Vertex Group",
+      "Matches the beginning of vertex group names from mesh objects, match all when left empty");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);