[Bf-blender-cvs] [6100c2d] master: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Sun May 8 17:11:11 CEST 2016


Commit: 6100c2d262c58c611ccc75a20cca23bf9f245767
Author: Campbell Barton
Date:   Mon May 9 01:16:58 2016 +1000
Branches: master
https://developer.blender.org/rB6100c2d262c58c611ccc75a20cca23bf9f245767

Cleanup: warnings

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

M	source/blender/blenkernel/intern/seqeffects.c
M	source/blender/editors/curve/editcurve_paint.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/space_action/action_buttons.c
M	source/blender/editors/space_file/filelist.c
M	source/blender/editors/space_file/filesel.c
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 4086fc2..3de4a42 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -3060,7 +3060,7 @@ static ImBuf *do_gaussian_blur_effect(const SeqRenderData *context,
 
 	ibuf1 = out;
 	init_data.ibuf = ibuf1;
-	out = prepare_effect_imbufs(context, ibuf1, NULL, NULL);;
+	out = prepare_effect_imbufs(context, ibuf1, NULL, NULL);
 	init_data.out = out;
 
 	IMB_processor_apply_threaded(out->y,
diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c
index 9986dd1..bb7cc61 100644
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@ -1119,7 +1119,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 			/* use view plane (when set or as fallback when surface can't be found) */
 			if (cdd->project.use_depth == false) {
-				plane_co = ED_view3d_cursor3d_get(cdd->vc.scene, v3d);;
+				plane_co = ED_view3d_cursor3d_get(cdd->vc.scene, v3d);
 				plane_no = rv3d->viewinv[2];
 				cdd->project.use_plane = true;
 			}
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index b8ff272..2ae1254 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4817,7 +4817,7 @@ static float calculate_point_length(PTCacheEditPoint *point)
 	KEY_K;
 	LOOP_KEYS {
 		if (k > 0) {
-			length += len_v3v3((key - 1)->co, key->co);;
+			length += len_v3v3((key - 1)->co, key->co);
 		}
 	}
 	return length;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 7ebc050..c173156 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2997,7 +2997,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t
 	const bool flip = (ss->cache->bstrength < 0);
 	const float radius    = flip ? -ss->cache->radius : ss->cache->radius;
 	const float offset    = get_offset(sd, ss);
-	const float displace  = radius * (0.25f + offset);;
+	const float displace  = radius * (0.25f + offset);
 
 	float area_no_sp[3];  /* the sculpt-plane normal (whatever its set to) */
 	float area_no[3];     /* geometry normal */
diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c
index a3112f1..063a477 100644
--- a/source/blender/editors/space_action/action_buttons.c
+++ b/source/blender/editors/space_action/action_buttons.c
@@ -74,7 +74,7 @@
 
 /* ******************* general ******************************** */
 
-void action_buttons_register(ARegionType *art)
+void action_buttons_register(ARegionType *UNUSED(art))
 {
 #if 0
 	PanelType *pt;
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 207879c..8e1f781 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1426,7 +1426,7 @@ int filelist_files_ensure(FileList *filelist)
 		filelist_filter(filelist);
 	}
 
-	return filelist->filelist.nbr_entries_filtered;;
+	return filelist->filelist.nbr_entries_filtered;
 }
 
 static FileDirEntry *filelist_file_create_entry(FileList *filelist, const int index)
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index ff5f1d3..bf90a4e 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -477,7 +477,7 @@ static void column_widths(FileSelectParams *params, struct FileLayout *layout)
 		layout->column_widths[i] = 0;
 	}
 
-	layout->column_widths[COLUMN_NAME] = ((float)params->thumbnail_size / 8.0f) * UI_UNIT_X;;
+	layout->column_widths[COLUMN_NAME] = ((float)params->thumbnail_size / 8.0f) * UI_UNIT_X;
 	/* Biggest possible reasonable values... */
 	layout->column_widths[COLUMN_DATE] = file_string_width(small_size ? "23/08/89" : "23-Dec-89");
 	layout->column_widths[COLUMN_TIME] = file_string_width("23:59");
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 691eae1..2c4e47a 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -816,7 +816,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1, 3);
 	RNA_def_property_ui_text(prop, "Iterations",
 	                         "Number of times to smooth newly created strokes."
-	                         "Smoothing strength is halved on each successive round of smoothing applied.");
+	                         "Smoothing strength is halved on each successive round of smoothing applied");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	/* Subdivision level for new strokes */




More information about the Bf-blender-cvs mailing list