[Bf-blender-cvs] [af7d3bb2dba] greasepencil-object: GPencil: Remove compiler warnings

Antonioya noreply at git.blender.org
Fri Jul 26 16:43:30 CEST 2019


Commit: af7d3bb2dba9689e330d498d257adc9180293e56
Author: Antonioya
Date:   Fri Jul 26 16:43:18 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBaf7d3bb2dba9689e330d498d257adc9180293e56

GPencil: Remove compiler warnings

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

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

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
index df390c5516f..ec06ead9a10 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
@@ -66,11 +66,6 @@
 #include "MOD_gpencil_util.h"
 #include "MOD_gpencil_modifiertypes.h"
 
-static void initData(GpencilModifierData *md)
-{
-  LengthGpencilModifierData *gpmd = (LengthGpencilModifierData *)md;
-}
-
 static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
 {
   BKE_gpencil_modifier_copyData_generic(md, target);
@@ -123,26 +118,17 @@ static void bakeModifier(Main *UNUSED(bmain),
 /* -------------------------------- */
 
 /* Generic "generateStrokes" callback */
-static void deformStroke(
-    GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
+static void deformStroke(GpencilModifierData *md,
+                         Depsgraph *depsgraph,
+                         Object *ob,
+                         bGPDlayer *gpl,
+                         bGPDframe *UNUSED(gpf),
+                         bGPDstroke *gps)
 {
   LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
   applyLength(gps, lmd->length, lmd->percentage);
 }
 
-static void updateDepsgraph(GpencilModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
-{
-  LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
-}
-
-static void foreachObjectLink(GpencilModifierData *md,
-                              Object *ob,
-                              ObjectWalkFunc walk,
-                              void *userData)
-{
-  LengthGpencilModifierData *mmd = (LengthGpencilModifierData *)md;
-}
-
 GpencilModifierTypeInfo modifierType_Gpencil_Length = {
     /* name */ "Length",
     /* structName */ "LengthGpencilModifierData",
@@ -157,12 +143,12 @@ GpencilModifierTypeInfo modifierType_Gpencil_Length = {
     /* bakeModifier */ bakeModifier,
     /* remapTime */ NULL,
 
-    /* initData */ initData,
+    /* initData */ NULL,
     /* freeData */ NULL,
     /* isDisabled */ NULL,
-    /* updateDepsgraph */ updateDepsgraph,
+    /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ foreachObjectLink,
+    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* foreachTexLink */ NULL,
     /* getDuplicationFactor */ NULL,
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index ab505cb0118..941d454272c 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -146,7 +146,6 @@ static void duplicateStroke(bGPDframe *gpf,
   bGPDstroke *new_gps;
   float stroke_normal[3];
   float minter[3];
-  float target1[3], target2[3];
   bGPDspoint *pt;
   float offset_factor;
   float thickness_factor;
@@ -297,19 +296,6 @@ static void generateStrokes(
   }
 }
 
-static void updateDepsgraph(GpencilModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
-{
-  MultiplyGpencilModifierData *mmd = (MultiplyGpencilModifierData *)md;
-}
-
-static void foreachObjectLink(GpencilModifierData *md,
-                              Object *ob,
-                              ObjectWalkFunc walk,
-                              void *userData)
-{
-  MultiplyGpencilModifierData *mmd = (MultiplyGpencilModifierData *)md;
-}
-
 GpencilModifierTypeInfo modifierType_Gpencil_Multiply = {
     /* name */ "Multiple Strokes",
     /* structName */ "MultiplyGpencilModifierData",
@@ -327,9 +313,9 @@ GpencilModifierTypeInfo modifierType_Gpencil_Multiply = {
     /* initData */ initData,
     /* freeData */ NULL,
     /* isDisabled */ NULL,
-    /* updateDepsgraph */ updateDepsgraph,
+    /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ foreachObjectLink,
+    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* foreachTexLink */ NULL,
     /* getDuplicationFactor */ NULL,



More information about the Bf-blender-cvs mailing list