[Bf-blender-cvs] [7b76f9f6b6f] temp-lineart-contained: LineArt: Binary weights option.

[YimingWu]

Commit: 7b76f9f6b6f17c7a63d355f07d3126761ebacba0
Author: YimingWu
Date:   Fri Mar 19 09:11:14 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB7b76f9f6b6f17c7a63d355f07d3126761ebacba0

LineArt: Binary weights option.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index ef74c1b861a..8a05b618f03 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit ef74c1b861a1b05c2483a2c045a6380704167491
+Subproject commit 8a05b618f031582c006c6f62b9e60619ab3eef8b
diff --git a/release/scripts/addons b/release/scripts/addons
index 6dfba915743..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 6dfba915743b67aff99ddcc19c0807d339a87c96
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 9a7ed53cedb..6e9962caf80 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -110,7 +110,8 @@ static void generate_strokes_actual(
       lmd->resample_length,
       lmd->source_vertex_group,
       lmd->vgname,
-      lmd->flags);
+      lmd->flags,
+      lmd->weight_threshold);
 }
 
 static bool isModifierDisabled(GpencilModifierData *md)
@@ -421,7 +422,9 @@ static void vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel)
         col, ptr, "vertex_group", &ob_ptr, "vertex_groups", IFACE_("Target"), ICON_NONE);
   }
 
+  col = uiLayoutColumn(layout, true);
   uiItemR(col, ptr, "binary_weights", 0, NULL, ICON_NONE);
+  uiItemR(col, ptr, "weight_threshold", 0, NULL, ICON_NONE);
 }
 
 static void baking_panel_draw(const bContext *UNUSED(C), Panel *panel)
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index c3cd2e4ba03..95ea9be20cc 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -3855,7 +3855,7 @@ static void lineart_gpencil_generate(LineartRenderBuffer *rb,
                     gdw->weight = MAX2(use_weight, gdw->weight);
                   }
                   else {
-                    if (mdw->weight > 0.999f) {
+                    if (mdw->weight > weight_threshold) {
                       gdw->weight = 1.0f;
                     }
                   }
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 1745551d6af..781e6dd3c75 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -113,7 +113,8 @@ static bool bake_strokes(Object *ob, Depsgraph *dg, GpencilModifierData *md, int
       lmd->resample_length,
       lmd->source_vertex_group,
       lmd->vgname,
-      lmd->flags);
+      lmd->flags,
+      lmd->weight_threshold);
 
   MOD_lineart_destroy_render_data(lmd);
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 2025b4b3124..1ac40d5e4c2 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2382,12 +2382,10 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna)
   RNA_def_property_range(prop, 0.0f, DEG2RAD(180.0f));
   RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "weight_threshold", PROP_FLOAT, PROP_ANGLE);
+  prop = RNA_def_property(srna, "weight_threshold", PROP_FLOAT, PROP_NONE);
   RNA_def_property_ui_text(
       prop, "Weight Threshold", "Treat all weights above this value as 1 in binary weights mode.");
-  /*  Don't allow value very close to PI, or we get a lot of small segments.*/
-  RNA_def_property_ui_range(prop, 0.0f, DEG2RAD(179.5f), 0.01f, 1);
-  RNA_def_property_range(prop, 0.0f, DEG2RAD(180.0f));
+  RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01f, 1);
   RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "remove_doubles", PROP_BOOLEAN, PROP_NONE);