[Bf-blender-cvs] [7194a1acdd3] greasepencil-object: GPencil: Fix compiler warnings

[Antonio Vazquez]

Commit: 7194a1acdd35a08aa2420ce9f52d2cd14f7821d0
Author: Antonio Vazquez
Date:   Wed Mar 4 18:30:02 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7194a1acdd35a08aa2420ce9f52d2cd14f7821d0

GPencil: Fix compiler warnings

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 0fbd511d592..1cb0e12e6c4 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1090,9 +1090,9 @@ void BKE_gpencil_layer_mask_sort(bGPdata *gpd, bGPDlayer *gpl)
 {
   /* Update sort index. */
   LISTBASE_FOREACH (bGPDlayer_Mask *, mask, &gpl->mask_layers) {
-    bGPDlayer *gpl = BKE_gpencil_layer_named_get(gpd, mask->name);
-    if (gpl != NULL) {
-      mask->sort_index = BLI_findindex(&gpd->layers, gpl);
+    bGPDlayer *gpl_mask = BKE_gpencil_layer_named_get(gpd, mask->name);
+    if (gpl_mask != NULL) {
+      mask->sort_index = BLI_findindex(&gpd->layers, gpl_mask);
     }
     else {
       mask->sort_index = 0;
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 247a91b66b0..642bb615340 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3684,7 +3684,7 @@ void GPENCIL_OT_reproject(wmOperatorType *ot)
       ot->srna, "type", reproject_type, GP_REPROJECT_VIEW, "Projection Type", "");
 }
 
-static int gp_recalc_geometry_exec(bContext *C, wmOperator *op)
+static int gp_recalc_geometry_exec(bContext *C, wmOperator *UNUSED(op))
 {
   Object *ob = CTX_data_active_object(C);
   if ((ob == NULL) || (ob->type != OB_GPENCIL)) {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
index b672f9fe79b..54166011519 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
@@ -98,7 +98,7 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
 
 /* deform stroke */
 static void deformStroke(GpencilModifierData *md,
-                         Depsgraph *depsgraph,
+                         Depsgraph *UNUSED(depsgraph),
                          Object *ob,
                          bGPDlayer *gpl,
                          bGPDframe *UNUSED(gpf),