[Bf-blender-cvs] [b33dc98893c] lanpr-under-gp: LineArt: Remove angle splitting properties in multiply modifier.

[YimingWu]

Commit: b33dc98893cd8873c53ac7d05b9738d7ee70aa63
Author: YimingWu
Date:   Wed Jul 29 18:23:54 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBb33dc98893cd8873c53ac7d05b9738d7ee70aa63

LineArt: Remove angle splitting properties in multiply modifier.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
M	source/blender/makesdna/DNA_gpencil_modifier_types.h
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 619c37015e4..352427304a4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -77,7 +77,6 @@ static void initData(GpencilModifierData *md)
   MultiplyGpencilModifierData *mmd = (MultiplyGpencilModifierData *)md;
   mmd->duplications = 3;
   mmd->distance = 0.1f;
-  mmd->split_angle = DEG2RADF(1.0f);
   mmd->fading_center = 0.5f;
   mmd->fading_thickness = 0.5f;
   mmd->fading_opacity = 0.5f;
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 22e3d266fcc..dbc73b67c1f 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -683,7 +683,6 @@ typedef struct MultiplyGpencilModifierData {
   int flag;
   /** Custom index for passes. */
   int layer_pass;
-  char _pad[4];
 
   int flags;
 
@@ -696,9 +695,6 @@ typedef struct MultiplyGpencilModifierData {
   float fading_thickness;
   float fading_opacity;
 
-  /* in rad not deg */
-  float split_angle;
-
   /* char _pad[4]; */
 } MultiplyGpencilModifierData;
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index e1e3e73b2cf..7ae3a34fa73 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2126,22 +2126,11 @@ 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_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");
-  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
-
   prop = RNA_def_property(srna, "use_fade", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flags", GP_MULTIPLY_ENABLE_FADING);
   RNA_def_property_ui_text(prop, "Fade", "Fade the stroke thickness for each generated stroke");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE);
-  RNA_def_property_range(prop, 0, M_PI);
-  RNA_def_property_ui_range(prop, 0, M_PI, 10, 2);
-  RNA_def_property_ui_text(prop, "Angle", "Split angle for segments");
-  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
-
   prop = RNA_def_property(srna, "duplicates", PROP_INT, PROP_NONE);
   RNA_def_property_int_sdna(prop, NULL, "duplications");
   RNA_def_property_range(prop, 0, 999);