[Bf-blender-cvs] [07724a7c73e] greasepencil-refactor: Cleanup: GPencil: Remove GCC warnings

[Clément Foucault]

Commit: 07724a7c73e91652efa298b44607f46794224776
Author: Clément Foucault
Date:   Wed Jan 8 19:45:43 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB07724a7c73e91652efa298b44607f46794224776

Cleanup: GPencil: Remove GCC warnings

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c
M	source/blender/makesrna/intern/rna_shader_fx.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 75463253406..4ea2258ca06 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3597,7 +3597,7 @@ void BKE_gpencil_convert_curve(Main *bmain,
 void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
 {
   const int totcol = 120;
-  static char *hexcol[] = {
+  const char *hexcol[] = {
       "FFFFFF", "F2F2F2", "E6E6E6", "D9D9D9", "CCCCCC", "BFBFBF", "B2B2B2", "A6A6A6", "999999",
       "8C8C8C", "808080", "737373", "666666", "595959", "4C4C4C", "404040", "333333", "262626",
       "1A1A1A", "000000", "F2FC24", "FFEA00", "FEA711", "FE8B68", "FB3B02", "FE3521", "D00000",
@@ -3626,7 +3626,7 @@ void BKE_gpencil_palette_ensure(Main *bmain, Scene *scene)
     for (int i = 0; i < totcol; i++) {
       PaletteColor *palcol = BKE_palette_color_add(paint->palette);
       if (palcol) {
-        hex_to_rgb(hexcol[i], palcol->rgb, palcol->rgb + 1, palcol->rgb + 2);
+        hex_to_rgb((char *)hexcol[i], palcol->rgb, palcol->rgb + 1, palcol->rgb + 2);
       }
     }
   }
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e4c76588f0e..ddf84889dc7 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -734,7 +734,7 @@ static void rna_GPencilInterpolateSettings_type_set(PointerRNA *ptr, int value)
   }
 }
 
-static void rna_Gpencil_extend_selection(bContext *C, PointerRNA *ptr)
+static void rna_Gpencil_extend_selection(bContext *C, PointerRNA *UNUSED(ptr))
 {
   /* Extend selection to all points in all selected strokes. */
   ViewLayer *view_layer = CTX_data_view_layer(C);
@@ -768,7 +768,7 @@ static void rna_Gpencil_selectmode_update(bContext *C, PointerRNA *ptr)
   rna_Gpencil_extend_selection(C, ptr);
 }
 
-static void rna_Gpencil_mask_point_update(bContext *C, PointerRNA *ptr)
+static void rna_Gpencil_mask_point_update(bContext *UNUSED(C), PointerRNA *ptr)
 {
   ToolSettings *ts = (ToolSettings *)ptr->data;
 
@@ -786,7 +786,7 @@ static void rna_Gpencil_mask_stroke_update(bContext *C, PointerRNA *ptr)
   rna_Gpencil_extend_selection(C, ptr);
 }
 
-static void rna_Gpencil_mask_segment_update(bContext *C, PointerRNA *ptr)
+static void rna_Gpencil_mask_segment_update(bContext *UNUSED(C), PointerRNA *ptr)
 {
   ToolSettings *ts = (ToolSettings *)ptr->data;
 
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index b8d5e09d112..7f973f175d2 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -1374,6 +1374,8 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna)
       {0, NULL, 0, NULL, NULL},
   };
 
+  UNUSED_VARS(prop_direction_items);
+
   StructRNA *srna;
   PropertyRNA *prop;
 
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index 6165f62c426..1d8fd163011 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -119,6 +119,7 @@ static StructRNA *rna_ShaderFx_refine(struct PointerRNA *ptr)
       /* Default */
     case eShaderFxType_None:
     case NUM_SHADER_FX_TYPES:
+    default:
       return &RNA_ShaderFx;
   }