[Bf-blender-cvs] [464eb5b042a] greasepencil-object: Cleanup: Fix compiler warnings

Antonio Vazquez noreply at git.blender.org
Thu Nov 9 19:30:06 CET 2017


Commit: 464eb5b042aef382530f2e455e6e12ed9f21efa7
Author: Antonio Vazquez
Date:   Thu Nov 9 19:29:57 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB464eb5b042aef382530f2e455e6e12ed9f21efa7

Cleanup: Fix compiler warnings

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

M	source/blender/modifiers/intern/MOD_gpencilarray.c
M	source/blender/modifiers/intern/MOD_gpencilsubdiv.c

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

diff --git a/source/blender/modifiers/intern/MOD_gpencilarray.c b/source/blender/modifiers/intern/MOD_gpencilarray.c
index 72a7cc18a27..a06a514dae2 100644
--- a/source/blender/modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/modifiers/intern/MOD_gpencilarray.c
@@ -132,8 +132,8 @@ void BKE_gpencil_array_modifier_instance_tfm(GpencilArrayModifierData *mmd, cons
 
 /* array modifier - generate geometry callback (for viewport/rendering) */
 /* TODO: How to skip this for the simplify options?   -->  !GP_SIMPLIFY_MODIF(ts, playing) */
-static void generate_geometry(ModifierData *md, const EvaluationContext *eval_ctx,
-	                          Object *ob, bGPDlayer *gpl, bGPDframe *gpf,
+static void generate_geometry(ModifierData *md, const EvaluationContext *UNUSED(eval_ctx),
+	                          Object *UNUSED(ob), bGPDlayer *gpl, bGPDframe *gpf,
 	                          int modifier_index)
 {
 	GpencilArrayModifierData *mmd = (GpencilArrayModifierData *)md;
@@ -242,7 +242,7 @@ static void generate_geometry(ModifierData *md, const EvaluationContext *eval_ct
 }
 
 /* bakeModifierGP - "Bake to Data" Mode */
-static void bakeModifierGP_strokes(const bContext *C, const EvaluationContext *eval_ctx,
+static void bakeModifierGP_strokes(const bContext *UNUSED(C), const EvaluationContext *eval_ctx,
                                       ModifierData *md, Object *ob)
 {
 	bGPdata *gpd = ob->data;
@@ -280,7 +280,6 @@ static Object *array_instance_add_ob_copy(const bContext *C, Object *from_ob)
 static void bakeModifierGP_objects(const bContext *C, ModifierData *md, Object *ob)
 {
 	GpencilArrayModifierData *mmd = (GpencilArrayModifierData *)md;
-	Main *bmain = CTX_data_main(C);
 	
 	/* reset random */
 	mmd->rnd[0] = 1;
diff --git a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
index e5cf6085874..d4295c2c61f 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
@@ -63,7 +63,7 @@ static void copyData(ModifierData *md, ModifierData *target)
 
 /* subdivide stroke to get more control points */
 static void deformStroke(ModifierData *md, const EvaluationContext *UNUSED(eval_ctx),
-                         Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
+                         Object *UNUSED(ob), bGPDlayer *gpl, bGPDstroke *gps)
 {
 	GpencilSubdivModifierData *mmd = (GpencilSubdivModifierData *)md;
 	bGPDspoint *temp_points;



More information about the Bf-blender-cvs mailing list