[Bf-blender-cvs] [dca23ccc4ec] greasepencil-object: Cleanup: Fix some more warnings

[Joshua Leung]

Commit: dca23ccc4ecfb3180eca27256b0eb9dd906db27f
Author: Joshua Leung
Date:   Tue May 1 16:26:50 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdca23ccc4ecfb3180eca27256b0eb9dd906db27f

Cleanup: Fix some more warnings

NOTE: For rna_GPencil_stroke_new(), the problems aren't entirely eliminated yet.
Specifically, the colorname arg is now unused - it was used in the past to
specify what color the new strokes should have.

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

M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/makesrna/intern/rna_gpencil.c
M	source/blender/makesrna/intern/rna_material.c

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index d4e2a37a7c0..6acc9bc1a62 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1152,7 +1152,6 @@ void ED_gpencil_add_defaults(bContext *C)
 	Main *bmain = CTX_data_main(C);
 	Object *ob = CTX_data_active_object(C);
 	ToolSettings *ts = CTX_data_tool_settings(C);
-	bGPdata *gpd = CTX_data_gpencil_data(C);
 
 	/* first try to reuse default material */
 	if (ob->actcol > 0) {
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 397a63b49d8..89c7ef76a2c 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -459,9 +459,7 @@ static void rna_GPencil_stroke_point_pop(bGPDstroke *stroke, ReportList *reports
 static bGPDstroke *rna_GPencil_stroke_new(bGPDframe *frame, const char *colorname)
 {
 	bGPDstroke *stroke = MEM_callocN(sizeof(bGPDstroke), "gp_stroke");
-	if (colorname) {
-		BLI_strncpy(stroke->colorname, colorname, sizeof(stroke->colorname));
-	}
+	/* XXX: colorname is unused */
 	stroke->flag |= GP_STROKE_RECALC_COLOR;
 	BLI_addtail(&frame->strokes, stroke);
 
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 8430d50e073..0a4ce906688 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -259,7 +259,7 @@ static void rna_gpcolordata_uv_update(Main *bmain, Scene *scene, PointerRNA *ptr
 	rna_Material_update(bmain, scene, ptr);
 }
 
-static char *rna_GpencilColorData_path(PointerRNA *ptr)
+static char *rna_GpencilColorData_path(PointerRNA *UNUSED(ptr))
 {
 	return BLI_sprintfN("grease_pencil");
 }