[Bf-blender-cvs] [9d742a0e04c] greasepencil-object: GPencil: Remove Angle Split from Multistroke Modifier

Antonio Vazquez noreply at git.blender.org
Fri Mar 6 17:52:21 CET 2020


Commit: 9d742a0e04cff97b06852cf729730de151e478d6
Author: Antonio Vazquez
Date:   Fri Mar 6 17:34:48 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9d742a0e04cff97b06852cf729730de151e478d6

GPencil: Remove Angle Split from Multistroke Modifier

This function is not clear how use it and it's getting segment faults. As the original developer that knows the function is not available, we remove the function and pending of adding in the future.

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 6a2ef97fd82..8f226f8342a 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -2139,12 +2139,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
             subcol.prop(md, "fading_thickness", slider=True)
             subcol.prop(md, "fading_opacity", slider=True)
 
-        subcol.separator()
-
-        col.prop(md, "enable_angle_splitting")
-        if md.enable_angle_splitting:
-            col.prop(md, "split_angle")
-
         self.gpencil_masking(layout, ob, md, False)
 
     def GP_VERTEXCOLOR(self, layout, ob, md):
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 4f78bf8216a..43d8626ef38 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -77,29 +77,6 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
   BKE_gpencil_modifier_copyData_generic(md, target);
 }
 
-static void splitStroke(bGPDframe *gpf, bGPDstroke *gps, float split_angle)
-{
-  bGPDspoint *pt = gps->points;
-  bGPDstroke *new_gps = gps;
-  int i;
-  volatile float angle;
-
-  if (split_angle <= FLT_EPSILON) {
-    return;
-  }
-
-  for (i = 1; i < new_gps->totpoints - 1; i++) {
-    angle = angle_v3v3v3(&pt[i - 1].x, &pt[i].x, &pt[i + 1].x);
-    if (angle < split_angle) {
-      if (BKE_gpencil_stroke_split(gpf, new_gps, i, &new_gps)) {
-        pt = new_gps->points;
-        i = 0;
-        continue; /* then i == 1 again */
-      }
-    }
-  }
-}
-
 static void minter_v3_v3v3v3_ref(
     float *result, float *prev, float *curr, float *next, float *stroke_normal)
 {
@@ -241,9 +218,6 @@ static void bakeModifier(Main *UNUSED(bmain),
                                             mmd->flag & GP_MIRROR_INVERT_MATERIAL)) {
           continue;
         }
-        if (mmd->flags & GP_MULTIPLY_ENABLE_ANGLE_SPLITTING) {
-          splitStroke(gpf, gps, mmd->split_angle);
-        }
         if (mmd->duplications > 0) {
           duplicateStroke(ob,
                           gps,
@@ -285,9 +259,6 @@ static void generate_geometry(GpencilModifierData *md, Object *ob, bGPDlayer *gp
                                         mmd->flag & GP_MIRROR_INVERT_MATERIAL)) {
       continue;
     }
-    if (mmd->flags & GP_MULTIPLY_ENABLE_ANGLE_SPLITTING) {
-      splitStroke(gpf, gps, mmd->split_angle);
-    }
     if (mmd->duplications > 0) {
       duplicateStroke(ob,
                       gps,



More information about the Bf-blender-cvs mailing list