[Bf-blender-cvs] [6e38a00d45c] soc-2019-npr: GPencil: Fix length modifier wrong callback.

YimingWu noreply at git.blender.org
Thu Jul 18 09:12:39 CEST 2019


Commit: 6e38a00d45c4fccaa1dd908f2d5fa2978e2fe713
Author: YimingWu
Date:   Thu Jul 18 15:12:13 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB6e38a00d45c4fccaa1dd908f2d5fa2978e2fe713

GPencil: Fix length modifier wrong callback.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencillength.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
index 85d0afa0602..df390c5516f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
@@ -86,7 +86,7 @@ static void stretchOrShrinkStroke(bGPDstroke *gps, float length)
   }
 }
 
-static void deformStroke(bGPDstroke *gps, float length, float percentage)
+static void applyLength(bGPDstroke *gps, float length, float percentage)
 {
 
   stretchOrShrinkStroke(gps, length);
@@ -113,7 +113,7 @@ static void bakeModifier(Main *UNUSED(bmain),
       LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
       bGPDstroke *gps;
       for (gps = gpf->strokes.first; gps; gps = gps->next) {
-        deformStroke(gps, lmd->length, lmd->percentage);
+        applyLength(gps, lmd->length, lmd->percentage);
       }
       return;
     }
@@ -123,14 +123,11 @@ static void bakeModifier(Main *UNUSED(bmain),
 /* -------------------------------- */
 
 /* Generic "generateStrokes" callback */
-static void generateStrokes(
-    GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf)
+static void deformStroke(
+    GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
 {
   LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
-  bGPDstroke *gps;
-  for (gps = gpf->strokes.first; gps; gps = gps->next) {
-    deformStroke(gps, lmd->length, lmd->percentage);
-  }
+  applyLength(gps, lmd->length, lmd->percentage);
 }
 
 static void updateDepsgraph(GpencilModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
@@ -155,8 +152,8 @@ GpencilModifierTypeInfo modifierType_Gpencil_Length = {
 
     /* copyData */ copyData,
 
-    /* deformStroke */ NULL,
-    /* generateStrokes */ generateStrokes,
+    /* deformStroke */ deformStroke,
+    /* generateStrokes */ NULL,
     /* bakeModifier */ bakeModifier,
     /* remapTime */ NULL,



More information about the Bf-blender-cvs mailing list