[Bf-blender-cvs] [56ec606413e] blender2.8: Cleanup: style

[Campbell Barton]

Commit: 56ec606413ef67aead62a04e8e1c7d89be90ece4
Author: Campbell Barton
Date:   Sun Aug 26 19:57:19 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB56ec606413ef67aead62a04e8e1c7d89be90ece4

Cleanup: style

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

M	source/blender/blenkernel/intern/brush.c
M	source/blender/blenkernel/intern/colortools.c
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/editors/gpencil/annotate_paint.c

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 1444cc6deaf..84df994f051 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -535,7 +535,7 @@ void BKE_brush_update_material(Main *bmain, Material *ma, Brush *exclude_brush)
 		if (brush->gpencil_settings != NULL) {
 			BrushGpencilSettings *gpencil_settings = brush->gpencil_settings;
 			if (((gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) == 0) &&
-				(gpencil_settings->material != ma))
+			    (gpencil_settings->material != ma))
 			{
 				gpencil_settings->material = ma;
 			}
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 0684231480b..c090569421d 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -956,17 +956,15 @@ static void curvemapping_evaluateRGBF_filmlike(const CurveMapping *cumap, float
 
 static float curvemapping_weighted_standard_triangle(float a, float b, float a1)
 {
-	if (a != b)
-	{
+	if (a != b) {
 		float b1;
 		float a2 = a1 - a;
 
-		if (b < a)
-		{
-				b1 = b + a2 *      b  /     a ;
+		if (b < a) {
+			b1 = b + a2 * b / a ;
 		}
 		else {
-				b1 = b + a2 * (65535.f - b) / (65535.f - a);
+			b1 = b + a2 * (65535.0f - b) / (65535.0f - a);
 		}
 
 		return b1;
@@ -992,8 +990,7 @@ void curvemapping_evaluate_premulRGBF_ex(
 	const float g = (vecin[1] - black[1]) * bwmul[1];
 	const float b = (vecin[2] - black[2]) * bwmul[2];
 
-	switch (cumap->tone)
-	{
+	switch (cumap->tone) {
 		default:
 		case CURVE_TONE_STANDARD:
 		{
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 979f2197df0..7d48a243cbb 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -143,7 +143,7 @@ DepsgraphNodeBuilder::DepsgraphNodeBuilder(Main *bmain, Depsgraph *graph)
       view_layer_(NULL),
       view_layer_index_(-1),
       collection_(NULL),
-	  is_parent_collection_visible_(true),
+      is_parent_collection_visible_(true),
       cow_id_hash_(NULL)
 {
 }
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
index bb79085ae51..47b4895942e 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
@@ -89,7 +89,7 @@ bool stat_entry_comparator(const StatsEntry& a, const StatsEntry& b)
 
 string gnuplotify_id_code(const string& name)
 {
-	return string("") + name[0] + name [1];
+	return string("") + name[0] + name[1];
 }
 
 string gnuplotify_name(const string& name)
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index e401712828d..fffef635633 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -383,7 +383,7 @@ void GPENCIL_cache_init(void *vedata)
 		{
 			if (((obact_gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) &&
 			    (obact_gpd->runtime.sbuffer_size > 0) &&
-				((obact_gpd->flag & GP_DATA_STROKE_POLYGON) == 0))
+			    ((obact_gpd->flag & GP_DATA_STROKE_POLYGON) == 0))
 			{
 				stl->g_data->session_flag |= GP_DRW_PAINT_PAINTING;
 			}
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 4f3d487bcf7..4f25dc421e4 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -270,7 +270,8 @@ static bool gp_stroke_filtermval(tGPsdata *p, const int mval[2], int pmval[2])
 }
 
 /* reproject the points of the stroke to a plane locked to axis to avoid stroke offset */
-static void gp_project_points_to_plane(RegionView3D *rv3d, bGPDstroke *gps, const float origin[3], const int axis)
+static void UNUSED_FUNCTION(gp_project_points_to_plane)(
+        RegionView3D *rv3d, bGPDstroke *gps, const float origin[3], const int axis)
 {
 	float plane_normal[3];
 	float vn[3];