[Bf-blender-cvs] [0d7fd2a08f8] greasepencil-object: More warnings cleanup

[Dalai Felinto]

Commit: 0d7fd2a08f83302d9e8d909bfed35e43c3aef488
Author: Dalai Felinto
Date:   Mon May 8 14:55:22 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0d7fd2a08f83302d9e8d909bfed35e43c3aef488

More warnings cleanup

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/sculpt_paint/paint_ops.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 4957364b23a..85223593493 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1290,9 +1290,9 @@ void BKE_gpencil_palettecolor_delete_allstrokes(PaletteColor *palcolor)
 	bGPDframe *gpf;
 	bGPDstroke *gps, *gpsn;
 
-	Main *main = G.main;
+	Main *bmain = G.main;
 
-	for (gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
+	for (gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) {
 		for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 			for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
 				for (gps = gpf->strokes.first; gps; gps = gpsn) {
@@ -1347,7 +1347,7 @@ void BKE_gpencil_palettecolor_delete(bGPDpalette *palette, bGPDpalettecolor *pal
 * \param basepath Shorter path fragment to look for
 * \return Whether there is a match
 */
-static bool gp_animpath_matches_basepath(const char path[], const char basepath[])
+static bool UNUSED_FUNCTION(gp_animpath_matches_basepath)(const char path[], const char basepath[])
 {
 	/* we need start of path to be basepath */
 	return (path && basepath) && STRPREFIX(path, basepath);
@@ -1356,7 +1356,7 @@ static bool gp_animpath_matches_basepath(const char path[], const char basepath[
 /* Transfer the animation data from bGPDpalette to Palette */
 void BKE_gpencil_move_animdata_to_palettes(bGPdata *gpd)
 {
-	Main *main = G.main;
+	Main *bmain = G.main;
 	Palette *palette = NULL;
 	AnimData *srcAdt = NULL, *dstAdt = NULL;
 	FCurve *fcu = NULL;
@@ -1382,7 +1382,7 @@ void BKE_gpencil_move_animdata_to_palettes(bGPdata *gpd)
 			int x = strcspn(fcu->rna_path, "[") + 2;
 			int y = strcspn(fcu->rna_path, "]");
 			BLI_strncpy(info, fcu->rna_path + x, y - x);
-			palette = BLI_findstring(&main->palettes, info, offsetof(ID, name) + 2);
+			palette = BLI_findstring(&bmain->palettes, info, offsetof(ID, name) + 2);
 			break;
 		}
 	}
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 6960591836f..c3e002ac378 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -285,7 +285,7 @@ static int palette_lock_layer_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_lock_layer(wmOperatorType *ot)
+static void PALETTE_OT_lock_layer(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Disable Unused Layer Colors";
@@ -437,7 +437,7 @@ static int palettecolor_isolate_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_isolate(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_isolate(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Isolate Palette Color";
@@ -489,7 +489,7 @@ static int palettecolor_hide_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_hide(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_hide(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Hide Color(s)";
@@ -528,7 +528,7 @@ static int palettecolor_reveal_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_reveal(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_reveal(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Show All Colors";
@@ -564,7 +564,7 @@ static int palettecolor_lock_all_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_lock_all(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_lock_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Lock All Colors";
@@ -600,7 +600,7 @@ static int palettecolor_unlock_all_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_unlock_all(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_unlock_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Unlock All Colors";
@@ -653,7 +653,7 @@ static int palettecolor_move_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_move(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_move(wmOperatorType *ot)
 {
 	static EnumPropertyItem slot_move[] = {
 		{ PALETTE_COLOR_MOVE_UP, "UP", 0, "Up", "" },
@@ -719,7 +719,7 @@ static int palettecolor_select_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_select(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Select Color";
@@ -773,7 +773,7 @@ static int palettecolor_copy_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-void PALETTE_OT_palettecolor_copy(wmOperatorType *ot)
+static void PALETTE_OT_palettecolor_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Copy Color";