[Bf-blender-cvs] [cfb867fdaff] lanpr-under-gp: LineArt: GPencil modifier API changes.

YimingWu noreply at git.blender.org
Fri Oct 2 07:40:28 CEST 2020


Commit: cfb867fdaffa965fbb74cb1d159b60926e91fb9c
Author: YimingWu
Date:   Fri Oct 2 12:03:06 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBcfb867fdaffa965fbb74cb1d159b60926e91fb9c

LineArt: GPencil modifier API changes.

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

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

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 050a1344863..cbe002b0751 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -306,16 +306,6 @@ static void freeData(GpencilModifierData *UNUSED(md))
   return;
 }
 
-static void foreachObjectLink(GpencilModifierData *md,
-                              Object *ob,
-                              ObjectWalkFunc walk,
-                              void *userData)
-{
-  LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
-
-  walk(userData, ob, &lmd->source_object, IDWALK_CB_NOP);
-}
-
 static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
 {
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
@@ -323,7 +313,7 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk,
   walk(userData, ob, (ID **)&lmd->target_material, IDWALK_CB_USER);
   walk(userData, ob, (ID **)&lmd->source_collection, IDWALK_CB_NOP);
 
-  foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
+  walk(userData, ob, &lmd->source_object, IDWALK_CB_NOP);
 }
 
 static void panel_draw(const bContext *C, Panel *panel)
@@ -458,7 +448,6 @@ GpencilModifierTypeInfo modifierType_Gpencil_Lineart = {
     /* isDisabled */ isDisabled,
     /* updateDepsgraph */ updateDepsgraph,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ foreachObjectLink,
     /* foreachIDLink */ foreachIDLink,
     /* foreachTexLink */ NULL,
     /* panelRegister */ panelRegister,



More information about the Bf-blender-cvs mailing list