Cleanup: indentation

11 files changed, 447 insertions, 445 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index f16c4c3574b..7248bde0d10 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -158,24 +158,24 @@ int BlenderFileLoader::countClippedFaces(float v1[3], float v2[3], float v3[3],
 		sum += clip[i];
 	}
 	switch (numClipped) {
-	case 0:
-		numTris = 1; // triangle
-		break;
-	case 1:
-		numTris = 2; // tetragon
-		break;
-	case 2:
-		if (sum == 0)
-			numTris = 3; // pentagon
-		else
+		case 0:
 			numTris = 1; // triangle
-		break;
-	case 3:
-		if (sum == 3 || sum == -3)
-			numTris = 0;
-		else
+			break;
+		case 1:
 			numTris = 2; // tetragon
-		break;
+			break;
+		case 2:
+			if (sum == 0)
+				numTris = 3; // pentagon
+			else
+				numTris = 1; // triangle
+			break;
+		case 3:
+			if (sum == 3 || sum == -3)
+				numTris = 0;
+			else
+				numTris = 2; // tetragon
+			break;
 	}
 	return numTris;
 }
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index d885ef4735f..9c3ff8999b7 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -176,17 +176,17 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
 		}
 #endif
 		switch (ob->type) {
-		case OB_MESH:
-			BKE_libblock_free(freestyle_bmain, ob);
-			BKE_libblock_free(freestyle_bmain, data);
-			break;
-		case OB_CAMERA:
-			BKE_libblock_free(freestyle_bmain, ob);
-			BKE_libblock_free(freestyle_bmain, data);
-			freestyle_scene->camera = NULL;
-			break;
-		default:
-			cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name + 2) << endl;
+			case OB_MESH:
+				BKE_libblock_free(freestyle_bmain, ob);
+				BKE_libblock_free(freestyle_bmain, data);
+				break;
+			case OB_CAMERA:
+				BKE_libblock_free(freestyle_bmain, ob);
+				BKE_libblock_free(freestyle_bmain, data);
+				freestyle_scene->camera = NULL;
+				break;
+			default:
+				cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name + 2) << endl;
 		}
 	}
 	BLI_freelistN(&freestyle_scene->base);
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 45da59e9215..6e65b021805 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -147,12 +147,12 @@ static void init_view(Render *re)
 
 	float thickness = 1.0f;
 	switch (re->r.line_thickness_mode) {
-	case R_LINE_THICKNESS_ABSOLUTE:
-		thickness = re->r.unit_line_thickness * (re->r.size / 100.f);
-		break;
-	case R_LINE_THICKNESS_RELATIVE:
-		thickness = height / 480.f;
-		break;
+		case R_LINE_THICKNESS_ABSOLUTE:
+			thickness = re->r.unit_line_thickness * (re->r.size / 100.f);
+			break;
+		case R_LINE_THICKNESS_RELATIVE:
+			thickness = height / 480.f;
+			break;
 	}
 
 	g_freestyle.viewport[0] = g_freestyle.viewport[1] = 0;
@@ -303,115 +303,115 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 	int layer_count = 0;
 
 	switch (config->mode) {
-	case FREESTYLE_CONTROL_SCRIPT_MODE:
-		if (G.debug & G_DEBUG_FREESTYLE) {
-			cout << "Modules :" << endl;
-		}
-		for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)config->modules.first;
-		     module_conf;
-		     module_conf = module_conf->next)
-		{
-			if (module_conf->script && module_conf->is_displayed) {
-				const char *id_name = module_conf->script->id.name + 2;
-				if (G.debug & G_DEBUG_FREESTYLE) {
-					cout << "  " << layer_count + 1 << ": " << id_name;
-					if (module_conf->script->name)
-						cout << " (" << module_conf->script->name << ")";
-					cout << endl;
-				}
-				controller->InsertStyleModule(layer_count, id_name, module_conf->script);
-				controller->toggleLayer(layer_count, true);
-				layer_count++;
+		case FREESTYLE_CONTROL_SCRIPT_MODE:
+			if (G.debug & G_DEBUG_FREESTYLE) {
+				cout << "Modules :" << endl;
 			}
-		}
-		if (G.debug & G_DEBUG_FREESTYLE) {
-			cout << endl;
-		}
-		controller->setComputeRidgesAndValleysFlag((config->flags & FREESTYLE_RIDGES_AND_VALLEYS_FLAG) ? true : false);
-		controller->setComputeSuggestiveContoursFlag((config->flags & FREESTYLE_SUGGESTIVE_CONTOURS_FLAG) ? true : false);
-		controller->setComputeMaterialBoundariesFlag((config->flags & FREESTYLE_MATERIAL_BOUNDARIES_FLAG) ? true : false);
-		break;
-	case FREESTYLE_CONTROL_EDITOR_MODE:
-		int use_ridges_and_valleys = 0;
-		int use_suggestive_contours = 0;
-		int use_material_boundaries = 0;
-		struct edge_type_condition conditions[] = {
-			{FREESTYLE_FE_SILHOUETTE, 0},
-			{FREESTYLE_FE_BORDER, 0},
-			{FREESTYLE_FE_CREASE, 0},
-			{FREESTYLE_FE_RIDGE_VALLEY, 0},
-			{FREESTYLE_FE_SUGGESTIVE_CONTOUR, 0},
-			{FREESTYLE_FE_MATERIAL_BOUNDARY, 0},
-			{FREESTYLE_FE_CONTOUR, 0},
-			{FREESTYLE_FE_EXTERNAL_CONTOUR, 0},
-			{FREESTYLE_FE_EDGE_MARK, 0}
-		};
-		int num_edge_types = sizeof(conditions) / sizeof(struct edge_type_condition);
-		if (G.debug & G_DEBUG_FREESTYLE) {
-			cout << "Linesets:" << endl;
-		}
-		for (FreestyleLineSet *lineset = (FreestyleLineSet *)config->linesets.first;
-		     lineset;
-		     lineset = lineset->next)
-		{
-			if (lineset->flags & FREESTYLE_LINESET_ENABLED) {
-				if (G.debug & G_DEBUG_FREESTYLE) {
-					cout << "  " << layer_count+1 << ": " << lineset->name << " - " <<
-					        (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl;
-				}
-				char *buffer = create_lineset_handler(srl->name, lineset->name);
-				controller->InsertStyleModule(layer_count, lineset->name, buffer);
-				controller->toggleLayer(layer_count, true);
-				MEM_freeN(buffer);
-				if (!(lineset->selection & FREESTYLE_SEL_EDGE_TYPES) || !lineset->edge_types) {
-					++use_ridges_and_valleys;
-					++use_suggestive_contours;
-					++use_material_boundaries;
-				}
-				else {
-					// conditions for feature edge selection by edge types
-					for (int i = 0; i < num_edge_types; i++) {
-						if (!(lineset->edge_types & conditions[i].edge_type))
-							conditions[i].value = 0; // no condition specified
-						else if (!(lineset->exclude_edge_types & conditions[i].edge_type))
-							conditions[i].value = 1; // condition: X
-						else
-							conditions[i].value = -1; // condition: NOT X
+			for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)config->modules.first;
+			     module_conf;
+			     module_conf = module_conf->next)
+			{
+				if (module_conf->script && module_conf->is_displayed) {
+					const char *id_name = module_conf->script->id.name + 2;
+					if (G.debug & G_DEBUG_FREESTYLE) {
+						cout << "  " << layer_count + 1 << ": " << id_name;
+						if (module_conf->script->name)
+							cout << " (" << module_conf->script->name << ")";
+						cout << endl;
 					}
-					// logical operator for the selection conditions
-					bool logical_and = ((lineset->flags & FREESTYLE_LINESET_FE_AND) != 0);
-					// negation operator
-					if (lineset->flags & FREESTYLE_LINESET_FE_NOT) {
-						// convert an Exclusive condition into an Inclusive equivalent using De Morgan's laws:
-						//   NOT (X OR Y) --> (NOT X) AND (NOT Y)
-						//   NOT (X AND Y) --> (NOT X) OR (NOT Y)
-						for (int i = 0; i < num_edge_types; i++)
-							conditions[i].value *= -1;
-						logical_and = !logical_and;
+					controller->InsertStyleModule(layer_count, id_name, module_conf->script);
+					controller->toggleLayer(layer_count, true);
+					layer_count++;
+				}
+			}
+			if (G.debug & G_DEBUG_FREESTYLE) {
+				cout << endl;
+			}
+			controller->setComputeRidgesAndValleysFlag((config->flags & FREESTYLE_RIDGES_AND_VALLEYS_FLAG) ? true : false);
+			controller->setComputeSuggestiveContoursFlag((config->flags & FREESTYLE_SUGGESTIVE_CONTOURS_FLAG) ? true : false);
+			controller->setComputeMaterialBoundariesFlag((config->flags & FREESTYLE_MATERIAL_BOUNDARIES_FLAG) ? true : false);
+			break;
+		case FREESTYLE_CONTROL_EDITOR_MODE:
+			int use_ridges_and_valleys = 0;
+			int use_suggestive_contours = 0;
+			int use_material_boundaries = 0;
+			struct edge_type_condition conditions[] = {
+				{FREESTYLE_FE_SILHOUETTE, 0},
+				{FREESTYLE_FE_BORDER, 0},
+				{FREESTYLE_FE_CREASE, 0},
+				{FREESTYLE_FE_RIDGE_VALLEY, 0},
+				{FREESTYLE_FE_SUGGESTIVE_CONTOUR, 0},
+				{FREESTYLE_FE_MATERIAL_BOUNDARY, 0},
+				{FREESTYLE_FE_CONTOUR, 0},
+				{FREESTYLE_FE_EXTERNAL_CONTOUR, 0},
+				{FREESTYLE_FE_EDGE_MARK, 0}
+			};
+			int num_edge_types = sizeof(conditions) / sizeof(struct edge_type_condition);
+			if (G.debug & G_DEBUG_FREESTYLE) {
+				cout << "Linesets:" << endl;
+			}
+			for (FreestyleLineSet *lineset = (FreestyleLineSet *)config->linesets.first;
+			     lineset;
+			     lineset = lineset->next)
+			{
+				if (lineset->flags & FREESTYLE_LINESET_ENABLED) {
+					if (G.debug & G_DEBUG_FREESTYLE) {
+						cout << "  " << layer_count+1 << ": " << lineset->name << " - " <<
+							(lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl;
 					}
-					if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
-					                              FREESTYLE_FE_RIDGE_VALLEY, true))
-					{
+					char *buffer = create_lineset_handler(srl->name, lineset->name);
+					controller->InsertStyleModule(layer_count, lineset->name, buffer);
+					controller->toggleLayer(layer_count, true);
+					MEM_freeN(buffer);
+					if (!(lineset->selection & FREESTYLE_SEL_EDGE_TYPES) || !lineset->edge_types) {
 						++use_ridges_and_valleys;
-					}
-					if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
-					                              FREESTYLE_FE_SUGGESTIVE_CONTOUR, true))
-					{
 						++use_suggestive_contours;
-					}
-					if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
-					                              FREESTYLE_FE_MATERIAL_BOUNDARY, true))
-					{
 						++use_material_boundaries;
 					}
+					else {
+						// conditions for feature edge selection by edge types
+						for (int i = 0; i < num_edge_types; i++) {
+							if (!(lineset->edge_types & conditions[i].edge_type))
+								conditions[i].value = 0; // no condition specified
+							else if (!(lineset->exclude_edge_types & conditions[i].edge_type))
+								conditions[i].value = 1; // condition: X
+							else
+								conditions[i].value = -1; // condition: NOT X
+						}
+						// logical operator for the selection conditions
+						bool logical_and = ((lineset->flags & FREESTYLE_LINESET_FE_AND) != 0);
+						// negation operator
+						if (lineset->flags & FREESTYLE_LINESET_FE_NOT) {
+							// convert an Exclusive condition into an Inclusive equivalent using De Morgan's laws:
+							//   NOT (X OR Y) --> (NOT X) AND (NOT Y)
+							//   NOT (X AND Y) --> (NOT X) OR (NOT Y)
+							for (int i = 0; i < num_edge_types; i++)
+								conditions[i].value *= -1;
+							logical_and = !logical_and;
+						}
+						if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
+						                              FREESTYLE_FE_RIDGE_VALLEY, true))
+						{
+							++use_ridges_and_valleys;
+						}
+						if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
+						                              FREESTYLE_FE_SUGGESTIVE_CONTOUR, true))
+						{
+							++use_suggestive_contours;
+						}
+						if (test_edge_type_conditions(conditions, num_edge_types, logical_and,
+						                              FREESTYLE_FE_MATERIAL_BOUNDARY, true))
+						{
+							++use_material_boundaries;
+						}
+					}
+					layer_count++;
 				}
-				layer_count++;
 			}
-		}
-		controller->setComputeRidgesAndValleysFlag(use_ridges_and_valleys > 0);
-		controller->setComputeSuggestiveContoursFlag(use_suggestive_contours > 0);
-		controller->setComputeMaterialBoundariesFlag(use_material_boundaries > 0);
-		break;
+			controller->setComputeRidgesAndValleysFlag(use_ridges_and_valleys > 0);
+			controller->setComputeSuggestiveContoursFlag(use_suggestive_contours > 0);
+			controller->setComputeMaterialBoundariesFlag(use_material_boundaries > 0);
+			break;
 	}
 
 	// set parameters
@@ -541,24 +541,24 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 	int count = 0;
 
 	switch (srl->freestyleConfig.mode) {
-	case FREESTYLE_CONTROL_SCRIPT_MODE:
-		for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first;
-		     module;
-		     module = module->next)
-		{
-			if (module->script && module->is_displayed)
-				count++;
-		}
-		break;
-	case FREESTYLE_CONTROL_EDITOR_MODE:
-		for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first;
-		     lineset;
-		     lineset = lineset->next)
-		{
-			if (lineset->flags & FREESTYLE_LINESET_ENABLED)
-				count++;
-		}
-		break;
+		case FREESTYLE_CONTROL_SCRIPT_MODE:
+			for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first;
+			     module;
+			     module = module->next)
+			{
+				if (module->script && module->is_displayed)
+					count++;
+			}
+			break;
+		case FREESTYLE_CONTROL_EDITOR_MODE:
+			for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first;
+			     lineset;
+			     lineset = lineset->next)
+			{
+				if (lineset->flags & FREESTYLE_LINESET_ENABLED)
+					count++;
+			}
+			break;
 	}
 	return count;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 1866058a151..3695e85cd15 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -157,38 +157,38 @@ static int FrsMaterial_mathutils_get(BaseMathObject *bmo, int subtype)
 {
 	BPy_FrsMaterial *self = (BPy_FrsMaterial *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_LINE:
-		bmo->data[0] = self->m->lineR();
-		bmo->data[1] = self->m->lineG();
-		bmo->data[2] = self->m->lineB();
-		bmo->data[3] = self->m->lineA();
-		break;
-	case MATHUTILS_SUBTYPE_DIFFUSE:
-		bmo->data[0] = self->m->diffuseR();
-		bmo->data[1] = self->m->diffuseG();
-		bmo->data[2] = self->m->diffuseB();
-		bmo->data[3] = self->m->diffuseA();
-		break;
-	case MATHUTILS_SUBTYPE_SPECULAR:
-		bmo->data[0] = self->m->specularR();
-		bmo->data[1] = self->m->specularG();
-		bmo->data[2] = self->m->specularB();
-		bmo->data[3] = self->m->specularA();
-		break;
-	case MATHUTILS_SUBTYPE_AMBIENT:
-		bmo->data[0] = self->m->ambientR();
-		bmo->data[1] = self->m->ambientG();
-		bmo->data[2] = self->m->ambientB();
-		bmo->data[3] = self->m->ambientA();
-		break;
-	case MATHUTILS_SUBTYPE_EMISSION:
-		bmo->data[0] = self->m->emissionR();
-		bmo->data[1] = self->m->emissionG();
-		bmo->data[2] = self->m->emissionB();
-		bmo->data[3] = self->m->emissionA();
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_LINE:
+			bmo->data[0] = self->m->lineR();
+			bmo->data[1] = self->m->lineG();
+			bmo->data[2] = self->m->lineB();
+			bmo->data[3] = self->m->lineA();
+			break;
+		case MATHUTILS_SUBTYPE_DIFFUSE:
+			bmo->data[0] = self->m->diffuseR();
+			bmo->data[1] = self->m->diffuseG();
+			bmo->data[2] = self->m->diffuseB();
+			bmo->data[3] = self->m->diffuseA();
+			break;
+		case MATHUTILS_SUBTYPE_SPECULAR:
+			bmo->data[0] = self->m->specularR();
+			bmo->data[1] = self->m->specularG();
+			bmo->data[2] = self->m->specularB();
+			bmo->data[3] = self->m->specularA();
+			break;
+		case MATHUTILS_SUBTYPE_AMBIENT:
+			bmo->data[0] = self->m->ambientR();
+			bmo->data[1] = self->m->ambientG();
+			bmo->data[2] = self->m->ambientB();
+			bmo->data[3] = self->m->ambientA();
+			break;
+		case MATHUTILS_SUBTYPE_EMISSION:
+			bmo->data[0] = self->m->emissionR();
+			bmo->data[1] = self->m->emissionG();
+			bmo->data[2] = self->m->emissionB();
+			bmo->data[3] = self->m->emissionA();
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -197,23 +197,23 @@ static int FrsMaterial_mathutils_set(BaseMathObject *bmo, int subtype)
 {
 	BPy_FrsMaterial *self = (BPy_FrsMaterial *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_LINE:
-		self->m->setLine(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
-		break;
-	case MATHUTILS_SUBTYPE_DIFFUSE:
-		self->m->setDiffuse(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
-		break;
-	case MATHUTILS_SUBTYPE_SPECULAR:
-		self->m->setSpecular(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
-		break;
-	case MATHUTILS_SUBTYPE_AMBIENT:
-		self->m->setAmbient(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
-		break;
-	case MATHUTILS_SUBTYPE_EMISSION:
-		self->m->setEmission(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_LINE:
+			self->m->setLine(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
+			break;
+		case MATHUTILS_SUBTYPE_DIFFUSE:
+			self->m->setDiffuse(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
+			break;
+		case MATHUTILS_SUBTYPE_SPECULAR:
+			self->m->setSpecular(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
+			break;
+		case MATHUTILS_SUBTYPE_AMBIENT:
+			self->m->setAmbient(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
+			break;
+		case MATHUTILS_SUBTYPE_EMISSION:
+			self->m->setEmission(bmo->data[0], bmo->data[1], bmo->data[2], bmo->data[3]);
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -222,38 +222,38 @@ static int FrsMaterial_mathutils_get_index(BaseMathObject *bmo, int subtype, int
 {
 	BPy_FrsMaterial *self = (BPy_FrsMaterial *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_LINE:
-		{
-			const float *color = self->m->line();
-			bmo->data[index] = color[index];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_DIFFUSE:
-		{
-			const float *color = self->m->diffuse();
-			bmo->data[index] = color[index];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_SPECULAR:
-		{
-			const float *color = self->m->specular();
-			bmo->data[index] = color[index];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_AMBIENT:
-		{
-			const float *color = self->m->ambient();
-			bmo->data[index] = color[index];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_EMISSION:
-		{
-			const float *color = self->m->emission();
-			bmo->data[index] = color[index];
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_LINE:
+			{
+				const float *color = self->m->line();
+				bmo->data[index] = color[index];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_DIFFUSE:
+			{
+				const float *color = self->m->diffuse();
+				bmo->data[index] = color[index];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_SPECULAR:
+			{
+				const float *color = self->m->specular();
+				bmo->data[index] = color[index];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_AMBIENT:
+			{
+				const float *color = self->m->ambient();
+				bmo->data[index] = color[index];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_EMISSION:
+			{
+				const float *color = self->m->emission();
+				bmo->data[index] = color[index];
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -263,33 +263,33 @@ static int FrsMaterial_mathutils_set_index(BaseMathObject *bmo, int subtype, int
 	BPy_FrsMaterial *self = (BPy_FrsMaterial *)bmo->cb_user;
 	float color[4];
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_LINE:
-		copy_v4_v4(color, self->m->line());
-		color[index] = bmo->data[index];
-		self->m->setLine(color[0], color[1], color[2], color[3]);
-		break;
-	case MATHUTILS_SUBTYPE_DIFFUSE:
-		copy_v4_v4(color, self->m->diffuse());
-		color[index] = bmo->data[index];
-		self->m->setDiffuse(color[0], color[1], color[2], color[3]);
-		break;
-	case MATHUTILS_SUBTYPE_SPECULAR:
-		copy_v4_v4(color, self->m->specular());
-		color[index] = bmo->data[index];
-		self->m->setSpecular(color[0], color[1], color[2], color[3]);
-		break;
-	case MATHUTILS_SUBTYPE_AMBIENT:
-		copy_v4_v4(color, self->m->ambient());
-		color[index] = bmo->data[index];
-		self->m->setAmbient(color[0], color[1], color[2], color[3]);
-		break;
-	case MATHUTILS_SUBTYPE_EMISSION:
-		copy_v4_v4(color, self->m->emission());
-		color[index] = bmo->data[index];
-		self->m->setEmission(color[0], color[1], color[2], color[3]);
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_LINE:
+			copy_v4_v4(color, self->m->line());
+			color[index] = bmo->data[index];
+			self->m->setLine(color[0], color[1], color[2], color[3]);
+			break;
+		case MATHUTILS_SUBTYPE_DIFFUSE:
+			copy_v4_v4(color, self->m->diffuse());
+			color[index] = bmo->data[index];
+			self->m->setDiffuse(color[0], color[1], color[2], color[3]);
+			break;
+		case MATHUTILS_SUBTYPE_SPECULAR:
+			copy_v4_v4(color, self->m->specular());
+			color[index] = bmo->data[index];
+			self->m->setSpecular(color[0], color[1], color[2], color[3]);
+			break;
+		case MATHUTILS_SUBTYPE_AMBIENT:
+			copy_v4_v4(color, self->m->ambient());
+			color[index] = bmo->data[index];
+			self->m->setAmbient(color[0], color[1], color[2], color[3]);
+			break;
+		case MATHUTILS_SUBTYPE_EMISSION:
+			copy_v4_v4(color, self->m->emission());
+			color[index] = bmo->data[index];
+			self->m->setEmission(color[0], color[1], color[2], color[3]);
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index 43313ef5213..fb7eb49127c 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -391,17 +391,17 @@ static int StrokeAttribute_mathutils_get(BaseMathObject *bmo, int subtype)
 {
 	BPy_StrokeAttribute *self = (BPy_StrokeAttribute *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_COLOR:
-		bmo->data[0] = self->sa->getColorR();
-		bmo->data[1] = self->sa->getColorG();
-		bmo->data[2] = self->sa->getColorB();
-		break;
-	case MATHUTILS_SUBTYPE_THICKNESS:
-		bmo->data[0] = self->sa->getThicknessR();
-		bmo->data[1] = self->sa->getThicknessL();
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_COLOR:
+			bmo->data[0] = self->sa->getColorR();
+			bmo->data[1] = self->sa->getColorG();
+			bmo->data[2] = self->sa->getColorB();
+			break;
+		case MATHUTILS_SUBTYPE_THICKNESS:
+			bmo->data[0] = self->sa->getThicknessR();
+			bmo->data[1] = self->sa->getThicknessL();
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -410,14 +410,14 @@ static int StrokeAttribute_mathutils_set(BaseMathObject *bmo, int subtype)
 {
 	BPy_StrokeAttribute *self = (BPy_StrokeAttribute *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_COLOR:
-		self->sa->setColor(bmo->data[0], bmo->data[1], bmo->data[2]);
-		break;
-	case MATHUTILS_SUBTYPE_THICKNESS:
-		self->sa->setThickness(bmo->data[0], bmo->data[1]);
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_COLOR:
+			self->sa->setColor(bmo->data[0], bmo->data[1], bmo->data[2]);
+			break;
+		case MATHUTILS_SUBTYPE_THICKNESS:
+			self->sa->setThickness(bmo->data[0], bmo->data[1]);
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -426,25 +426,25 @@ static int StrokeAttribute_mathutils_get_index(BaseMathObject *bmo, int subtype,
 {
 	BPy_StrokeAttribute *self = (BPy_StrokeAttribute *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_COLOR:
-		switch (index) {
-		case 0: bmo->data[0] = self->sa->getColorR(); break;
-		case 1: bmo->data[1] = self->sa->getColorG(); break;
-		case 2: bmo->data[2] = self->sa->getColorB(); break;
+		case MATHUTILS_SUBTYPE_COLOR:
+			switch (index) {
+				case 0: bmo->data[0] = self->sa->getColorR(); break;
+				case 1: bmo->data[1] = self->sa->getColorG(); break;
+				case 2: bmo->data[2] = self->sa->getColorB(); break;
+				default:
+					return -1;
+			}
+			break;
+		case MATHUTILS_SUBTYPE_THICKNESS:
+			switch (index) {
+				case 0: bmo->data[0] = self->sa->getThicknessR(); break;
+				case 1: bmo->data[1] = self->sa->getThicknessL(); break;
+				default:
+					return -1;
+			}
+			break;
 		default:
 			return -1;
-		}
-		break;
-	case MATHUTILS_SUBTYPE_THICKNESS:
-		switch (index) {
-		case 0: bmo->data[0] = self->sa->getThicknessR(); break;
-		case 1: bmo->data[1] = self->sa->getThicknessL(); break;
-		default:
-			return -1;
-		}
-		break;
-	default:
-		return -1;
 	}
 	return 0;
 }
@@ -453,23 +453,23 @@ static int StrokeAttribute_mathutils_set_index(BaseMathObject *bmo, int subtype,
 {
 	BPy_StrokeAttribute *self = (BPy_StrokeAttribute *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_COLOR:
-		{
-			float r = (index == 0) ? bmo->data[0] : self->sa->getColorR();
-			float g = (index == 1) ? bmo->data[1] : self->sa->getColorG();
-			float b = (index == 2) ? bmo->data[2] : self->sa->getColorB();
-			self->sa->setColor(r, g, b);
-		}
-		break;
-	case MATHUTILS_SUBTYPE_THICKNESS:
-		{
-			float tr = (index == 0) ? bmo->data[0] : self->sa->getThicknessR();
-			float tl = (index == 1) ? bmo->data[1] : self->sa->getThicknessL();
-			self->sa->setThickness(tr, tl);
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_COLOR:
+			{
+				float r = (index == 0) ? bmo->data[0] : self->sa->getColorR();
+				float g = (index == 1) ? bmo->data[1] : self->sa->getColorG();
+				float b = (index == 2) ? bmo->data[2] : self->sa->getColorB();
+				self->sa->setColor(r, g, b);
+			}
+			break;
+		case MATHUTILS_SUBTYPE_THICKNESS:
+			{
+				float tr = (index == 0) ? bmo->data[0] : self->sa->getThicknessR();
+				float tl = (index == 1) ? bmo->data[1] : self->sa->getThicknessL();
+				self->sa->setThickness(tr, tl);
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 33300ea70b5..d83a5a5174c 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -158,18 +158,18 @@ static int SVertex_mathutils_get(BaseMathObject *bmo, int subtype)
 {
 	BPy_SVertex *self = (BPy_SVertex *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_POINT3D:
-		bmo->data[0] = self->sv->getX();
-		bmo->data[1] = self->sv->getY();
-		bmo->data[2] = self->sv->getZ();
-		break;
-	case MATHUTILS_SUBTYPE_POINT2D:
-		bmo->data[0] = self->sv->getProjectedX();
-		bmo->data[1] = self->sv->getProjectedY();
-		bmo->data[2] = self->sv->getProjectedZ();
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_POINT3D:
+			bmo->data[0] = self->sv->getX();
+			bmo->data[1] = self->sv->getY();
+			bmo->data[2] = self->sv->getZ();
+			break;
+		case MATHUTILS_SUBTYPE_POINT2D:
+			bmo->data[0] = self->sv->getProjectedX();
+			bmo->data[1] = self->sv->getProjectedY();
+			bmo->data[2] = self->sv->getProjectedZ();
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -178,20 +178,20 @@ static int SVertex_mathutils_set(BaseMathObject *bmo, int subtype)
 {
 	BPy_SVertex *self = (BPy_SVertex *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_POINT3D:
-		{
-			Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
-			self->sv->setPoint3D(p);
-		}
-		break;
-	case MATHUTILS_SUBTYPE_POINT2D:
-		{
-			Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
-			self->sv->setPoint2D(p);
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_POINT3D:
+			{
+				Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
+				self->sv->setPoint3D(p);
+			}
+			break;
+		case MATHUTILS_SUBTYPE_POINT2D:
+			{
+				Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
+				self->sv->setPoint2D(p);
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -200,26 +200,26 @@ static int SVertex_mathutils_get_index(BaseMathObject *bmo, int subtype, int ind
 {
 	BPy_SVertex *self = (BPy_SVertex *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_POINT3D:
-		switch (index) {
-		case 0: bmo->data[0] = self->sv->getX(); break;
-		case 1: bmo->data[1] = self->sv->getY(); break;
-		case 2: bmo->data[2] = self->sv->getZ(); break;
+		case MATHUTILS_SUBTYPE_POINT3D:
+			switch (index) {
+				case 0: bmo->data[0] = self->sv->getX(); break;
+				case 1: bmo->data[1] = self->sv->getY(); break;
+				case 2: bmo->data[2] = self->sv->getZ(); break;
+				default:
+					return -1;
+			}
+			break;
+		case MATHUTILS_SUBTYPE_POINT2D:
+			switch (index) {
+				case 0: bmo->data[0] = self->sv->getProjectedX(); break;
+				case 1: bmo->data[1] = self->sv->getProjectedY(); break;
+				case 2: bmo->data[2] = self->sv->getProjectedZ(); break;
+				default:
+					return -1;
+			}
+			break;
 		default:
 			return -1;
-		}
-		break;
-	case MATHUTILS_SUBTYPE_POINT2D:
-		switch (index) {
-		case 0: bmo->data[0] = self->sv->getProjectedX(); break;
-		case 1: bmo->data[1] = self->sv->getProjectedY(); break;
-		case 2: bmo->data[2] = self->sv->getProjectedZ(); break;
-		default:
-			return -1;
-		}
-		break;
-	default:
-		return -1;
 	}
 	return 0;
 }
@@ -228,22 +228,22 @@ static int SVertex_mathutils_set_index(BaseMathObject *bmo, int subtype, int ind
 {
 	BPy_SVertex *self = (BPy_SVertex *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_POINT3D:
-		{
-			Vec3r p(self->sv->point3D());
-			p[index] = bmo->data[index];
-			self->sv->setPoint3D(p);
-		}
-		break;
-	case MATHUTILS_SUBTYPE_POINT2D:
-		{
-			Vec3r p(self->sv->point2D());
-			p[index] = bmo->data[index];
-			self->sv->setPoint2D(p);
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_POINT3D:
+			{
+				Vec3r p(self->sv->point3D());
+				p[index] = bmo->data[index];
+				self->sv->setPoint3D(p);
+			}
+			break;
+		case MATHUTILS_SUBTYPE_POINT2D:
+			{
+				Vec3r p(self->sv->point2D());
+				p[index] = bmo->data[index];
+				self->sv->setPoint2D(p);
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index ba773d4f4cf..09e33db529d 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -186,10 +186,10 @@ static int StrokeVertex_mathutils_get_index(BaseMathObject *bmo, int /*subtype*/
 {
 	BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
 	switch (index) {
-	case 0: bmo->data[0] = (float)self->sv->x(); break;
-	case 1: bmo->data[1] = (float)self->sv->y(); break;
-	default:
-		return -1;
+		case 0: bmo->data[0] = (float)self->sv->x(); break;
+		case 1: bmo->data[1] = (float)self->sv->y(); break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -198,10 +198,10 @@ static int StrokeVertex_mathutils_set_index(BaseMathObject *bmo, int /*subtype*/
 {
 	BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
 	switch (index) {
-	case 0: self->sv->setX((real)bmo->data[0]); break;
-	case 1: self->sv->setY((real)bmo->data[1]); break;
-	default:
-		return -1;
+		case 0: self->sv->setX((real)bmo->data[0]); break;
+		case 1: self->sv->setY((real)bmo->data[1]); break;
+		default:
+			return -1;
 	}
 	return 0;
 }
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index acdd5989511..319eee2945e 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -110,24 +110,24 @@ static int FEdgeSharp_mathutils_get(BaseMathObject *bmo, int subtype)
 {
 	BPy_FEdgeSharp *self = (BPy_FEdgeSharp *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_NORMAL_A:
-		{
-			Vec3r p(self->fes->normalA());
-			bmo->data[0] = p[0];
-			bmo->data[1] = p[1];
-			bmo->data[2] = p[2];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_NORMAL_B:
-		{
-			Vec3r p(self->fes->normalB());
-			bmo->data[0] = p[0];
-			bmo->data[1] = p[1];
-			bmo->data[2] = p[2];
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_NORMAL_A:
+			{
+				Vec3r p(self->fes->normalA());
+				bmo->data[0] = p[0];
+				bmo->data[1] = p[1];
+				bmo->data[2] = p[2];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_NORMAL_B:
+			{
+				Vec3r p(self->fes->normalB());
+				bmo->data[0] = p[0];
+				bmo->data[1] = p[1];
+				bmo->data[2] = p[2];
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -136,20 +136,20 @@ static int FEdgeSharp_mathutils_set(BaseMathObject *bmo, int subtype)
 {
 	BPy_FEdgeSharp *self = (BPy_FEdgeSharp *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_NORMAL_A:
-		{
-			Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
-			self->fes->setNormalA(p);
-		}
-		break;
-	case MATHUTILS_SUBTYPE_NORMAL_B:
-		{
-			Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
-			self->fes->setNormalB(p);
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_NORMAL_A:
+			{
+				Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
+				self->fes->setNormalA(p);
+			}
+			break;
+		case MATHUTILS_SUBTYPE_NORMAL_B:
+			{
+				Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
+				self->fes->setNormalB(p);
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -158,20 +158,20 @@ static int FEdgeSharp_mathutils_get_index(BaseMathObject *bmo, int subtype, int
 {
 	BPy_FEdgeSharp *self = (BPy_FEdgeSharp *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_NORMAL_A:
-		{
-			Vec3r p(self->fes->normalA());
-			bmo->data[index] = p[index];
-		}
-		break;
-	case MATHUTILS_SUBTYPE_NORMAL_B:
-		{
-			Vec3r p(self->fes->normalB());
-			bmo->data[index] = p[index];
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_NORMAL_A:
+			{
+				Vec3r p(self->fes->normalA());
+				bmo->data[index] = p[index];
+			}
+			break;
+		case MATHUTILS_SUBTYPE_NORMAL_B:
+			{
+				Vec3r p(self->fes->normalB());
+				bmo->data[index] = p[index];
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
@@ -180,22 +180,22 @@ static int FEdgeSharp_mathutils_set_index(BaseMathObject *bmo, int subtype, int
 {
 	BPy_FEdgeSharp *self = (BPy_FEdgeSharp *)bmo->cb_user;
 	switch (subtype) {
-	case MATHUTILS_SUBTYPE_NORMAL_A:
-		{
-			Vec3r p(self->fes->normalA());
-			p[index] = bmo->data[index];
-			self->fes->setNormalA(p);
-		}
-		break;
-	case MATHUTILS_SUBTYPE_NORMAL_B:
-		{
-			Vec3r p(self->fes->normalB());
-			p[index] = bmo->data[index];
-			self->fes->setNormalB(p);
-		}
-		break;
-	default:
-		return -1;
+		case MATHUTILS_SUBTYPE_NORMAL_A:
+			{
+				Vec3r p(self->fes->normalA());
+				p[index] = bmo->data[index];
+				self->fes->setNormalA(p);
+			}
+			break;
+		case MATHUTILS_SUBTYPE_NORMAL_B:
+			{
+				Vec3r p(self->fes->normalB());
+				p[index] = bmo->data[index];
+				self->fes->setNormalB(p);
+			}
+			break;
+		default:
+			return -1;
 	}
 	return 0;
 }
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 1eeb6805e7d..d179e8b7f18 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -573,7 +573,8 @@ void FEdgeXDetector::ProcessSuggestiveContourFace(WXFace *iFace)
 	real threshold = _meanKr;
 	if (faceLayer->nPosDotP()!=numVertices) {
 		if ((fabs(faceLayer->dotP(0)) < threshold) && (fabs(faceLayer->dotP(1)) < threshold) &&
-		    (fabs(faceLayer->dotP(2)) < threshold)) {
+		    (fabs(faceLayer->dotP(2)) < threshold))
+		{
 			faceLayer->ReplaceDotP(0, 0);
 			faceLayer->ReplaceDotP(1, 0);
 			faceLayer->ReplaceDotP(2, 0);
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 06ab3183027..16c9699dcef 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -1660,7 +1660,7 @@ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vect
 				sv = sv2;
 		}
 		else {
-		// if the shape is the same we can safely differ the two vertices using their ids:
+			// if the shape is the same we can safely differ the two vertices using their ids:
 			if (sv->getId() != fe->vertexA()->getId())
 				sv = sv2;
 		}
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 5b7576ccd3d..f5239b970f5 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -1947,7 +1947,8 @@ int ViewMapBuilder::ComputeRayCastingVisibility(FEdge *fe, Grid *iGrid, real eps
 	int viewport[4];
 	SilhouetteGeomEngine::retrieveViewport(viewport);
 	if ((A.x() < viewport[0]) || (A.x() > viewport[2]) || (A.y() < viewport[1]) || (A.y() > viewport[3]) ||
-	    (B.x() < viewport[0]) || (B.x() > viewport[2]) || (B.y() < viewport[1]) || (B.y() > viewport[3])) {
+	    (B.x() < viewport[0]) || (B.x() > viewport[2]) || (B.y() < viewport[1]) || (B.y() > viewport[3]))
+	{
 		cerr << "Warning: point is out of the grid for fedge " << fe->getId() << endl;
 		//return 0;
 	}