Gpencil: Don't use checkbox for stroke duplication modifier.temp-npr-gpencil-modifiers

5 files changed, 6 insertions, 12 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 02d8f82b4a9..eaeaf1ee4a3 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -2373,9 +2373,8 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
         gpd = ob.data
         sp = layout.split(factor = 0.5)
         col = sp.column()
-        col.prop(md, "enable_duplication")
-        if md.enable_duplication:
-            col.prop(md,"duplications")
+        col.prop(md,"duplications")
+        if md.duplications > 0:
             col.prop(md,"distance")
             col.prop(md,"offset", slider=True)
         
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index e4d65d23dc5..df18f89da6f 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1889,7 +1889,8 @@ bool BKE_gpencil_split_stroke(bGPDframe *gpf,
 
   /* Handle remaining segments first. */
 
-  new_gps = BKE_gpencil_add_stroke_existing_style(gpf, gps, gps->mat_nr, new_count, gps->thickness);
+  new_gps = BKE_gpencil_add_stroke_existing_style(
+      gpf, gps, gps->mat_nr, new_count, gps->thickness);
 
   new_pt = new_gps->points; /* Allocated from above. */
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 6dd25a2bf56..a6f565bc330 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -255,7 +255,7 @@ static void bakeModifier(Main *UNUSED(bmain),
         if (mmd->flags & GP_MULTIPLY_ENABLE_ANGLE_SPLITTING) {
           splitStroke(gpf, gps, mmd->split_angle);
         }
-        if (mmd->flags & GP_MULTIPLY_ENABLE_DUPLICATION) {
+        if (mmd->duplications > 0) {
           duplicateStroke(gpf,
                           gps,
                           mmd->duplications,
@@ -304,7 +304,7 @@ static void generateStrokes(
     if (mmd->flags & GP_MULTIPLY_ENABLE_ANGLE_SPLITTING) {
       splitStroke(gpf, gps, mmd->split_angle);
     }
-    if (mmd->flags & GP_MULTIPLY_ENABLE_DUPLICATION) {
+    if (mmd->duplications > 0) {
       duplicateStroke(gpf,
                       gps,
                       mmd->duplications,
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index dc51e9669b2..b2265b095e8 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -695,7 +695,6 @@ typedef struct MultiplyGpencilModifierData {
 } MultiplyGpencilModifierData;
 
 typedef enum eMultiplyGpencil_Flag {
-  GP_MULTIPLY_ENABLE_DUPLICATION = (1 << 0),
   GP_MULTIPLY_ENABLE_ANGLE_SPLITTING = (1 << 1),
   GP_MULTIPLY_ENABLE_FADING = (1 << 2),
 } eMultiplyGpencil_Flag;
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index b5279c40e19..eeeda31ef4a 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2001,11 +2001,6 @@ static void rna_def_modifier_gpencilmultiply(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Inverse Pass", "Inverse filter");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "enable_duplication", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "flags", GP_MULTIPLY_ENABLE_DUPLICATION);
-  RNA_def_property_ui_text(prop, "Duplication", "Enable stroke duplication");
-  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
-
   prop = RNA_def_property(srna, "enable_angle_splitting", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flags", GP_MULTIPLY_ENABLE_ANGLE_SPLITTING);
   RNA_def_property_ui_text(prop, "Angle Splitting", "Enable angle splitting");