A big cleaning patch by Bastien Montagne (thanks a lot!)

* Split and moved Cycles’ render layers panels into the render_layer
context as well (would be nice to hide this context when not needed,
e.g. with the BGE, but this is not so easy to do nicely...).

* Fixed some inconsistencies with trunk (probably due to svn merge
glitches) using r52858 as reference.  Also recovered the missing
release/bin/blender-softwaregl file.

* A bunch of style code fixes in Blender's own code (not Freestyle
itself yet): line lengths, spaces around operators, block formatting,
headers, etc.  In rna_linestyle.c, color_blend_items was replaced by
ramp_blend_items (exported from rna_material.c).

1 files changed, 258 insertions, 237 deletions

diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c
index 809603d5ddf..140a2db597e 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -1,6 +1,4 @@
-/**
- * $Id$
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -22,10 +20,15 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/makesrna/intern/rna_linestyle.c
+ *  \ingroup RNA
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 
@@ -36,29 +39,32 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
-EnumPropertyItem linestyle_color_modifier_type_items[] ={
+EnumPropertyItem linestyle_color_modifier_type_items[] = {
 	{LS_MODIFIER_ALONG_STROKE, "ALONG_STROKE", ICON_MODIFIER, "Along Stroke", ""},
 	{LS_MODIFIER_DISTANCE_FROM_CAMERA, "DISTANCE_FROM_CAMERA", ICON_MODIFIER, "Distance from Camera", ""},
 	{LS_MODIFIER_DISTANCE_FROM_OBJECT, "DISTANCE_FROM_OBJECT", ICON_MODIFIER, "Distance from Object", ""},
 	{LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
-EnumPropertyItem linestyle_alpha_modifier_type_items[] ={
+EnumPropertyItem linestyle_alpha_modifier_type_items[] = {
 	{LS_MODIFIER_ALONG_STROKE, "ALONG_STROKE", ICON_MODIFIER, "Along Stroke", ""},
 	{LS_MODIFIER_DISTANCE_FROM_CAMERA, "DISTANCE_FROM_CAMERA", ICON_MODIFIER, "Distance from Camera", ""},
 	{LS_MODIFIER_DISTANCE_FROM_OBJECT, "DISTANCE_FROM_OBJECT", ICON_MODIFIER, "Distance from Object", ""},
 	{LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
-EnumPropertyItem linestyle_thickness_modifier_type_items[] ={
+EnumPropertyItem linestyle_thickness_modifier_type_items[] = {
 	{LS_MODIFIER_ALONG_STROKE, "ALONG_STROKE", ICON_MODIFIER, "Along Stroke", ""},
 	{LS_MODIFIER_CALLIGRAPHY, "CALLIGRAPHY", ICON_MODIFIER, "Calligraphy", ""},
 	{LS_MODIFIER_DISTANCE_FROM_CAMERA, "DISTANCE_FROM_CAMERA", ICON_MODIFIER, "Distance from Camera", ""},
 	{LS_MODIFIER_DISTANCE_FROM_OBJECT, "DISTANCE_FROM_OBJECT", ICON_MODIFIER, "Distance from Object", ""},
 	{LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
-EnumPropertyItem linestyle_geometry_modifier_type_items[] ={
+EnumPropertyItem linestyle_geometry_modifier_type_items[] = {
 	{LS_MODIFIER_2D_OFFSET, "2D_OFFSET", ICON_MODIFIER, "2D Offset", ""},
 	{LS_MODIFIER_2D_TRANSFORM, "2D_TRANSFORM", ICON_MODIFIER, "2D Transform", ""},
 	{LS_MODIFIER_BACKBONE_STRETCHER, "BACKBONE_STRETCHER", ICON_MODIFIER, "Backbone Stretcher", ""},
@@ -72,7 +78,8 @@ EnumPropertyItem linestyle_geometry_modifier_type_items[] ={
 	{LS_MODIFIER_SINUS_DISPLACEMENT, "SINUS_DISPLACEMENT", ICON_MODIFIER, "Sinus Displacement", ""},
 	{LS_MODIFIER_SPATIAL_NOISE, "SPATIAL_NOISE", ICON_MODIFIER, "Spatial Noise", ""},
 	{LS_MODIFIER_TIP_REMOVER, "TIP_REMOVER", ICON_MODIFIER, "Tip Remover", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 #ifdef RNA_RUNTIME
 
@@ -82,7 +89,7 @@ static StructRNA *rna_LineStyle_color_modifier_refine(struct PointerRNA *ptr)
 {
 	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
-	switch(m->type) {
+	switch (m->type) {
 		case LS_MODIFIER_ALONG_STROKE:
 			return &RNA_LineStyleColorModifier_AlongStroke;
 		case LS_MODIFIER_DISTANCE_FROM_CAMERA:
@@ -100,7 +107,7 @@ static StructRNA *rna_LineStyle_alpha_modifier_refine(struct PointerRNA *ptr)
 {
 	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
-	switch(m->type) {
+	switch (m->type) {
 		case LS_MODIFIER_ALONG_STROKE:
 			return &RNA_LineStyleAlphaModifier_AlongStroke;
 		case LS_MODIFIER_DISTANCE_FROM_CAMERA:
@@ -118,7 +125,7 @@ static StructRNA *rna_LineStyle_thickness_modifier_refine(struct PointerRNA *ptr
 {
 	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
-	switch(m->type) {
+	switch (m->type) {
 		case LS_MODIFIER_ALONG_STROKE:
 			return &RNA_LineStyleThicknessModifier_AlongStroke;
 		case LS_MODIFIER_DISTANCE_FROM_CAMERA:
@@ -138,7 +145,7 @@ static StructRNA *rna_LineStyle_geometry_modifier_refine(struct PointerRNA *ptr)
 {
 	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
-	switch(m->type) {
+	switch (m->type) {
 		case LS_MODIFIER_SAMPLING:
 			return &RNA_LineStyleGeometryModifier_Sampling;
 		case LS_MODIFIER_BEZIER_CURVE:
@@ -172,58 +179,62 @@ static StructRNA *rna_LineStyle_geometry_modifier_refine(struct PointerRNA *ptr)
 
 static char *rna_LineStyle_color_modifier_path(PointerRNA *ptr)
 {
-	return BLI_sprintfN("color_modifiers[\"%s\"]", ((LineStyleModifier*)ptr->data)->name);
+	return BLI_sprintfN("color_modifiers[\"%s\"]", ((LineStyleModifier *)ptr->data)->name);
 }
 
 static char *rna_LineStyle_alpha_modifier_path(PointerRNA *ptr)
 {
-	return BLI_sprintfN("alpha_modifiers[\"%s\"]", ((LineStyleModifier*)ptr->data)->name);
+	return BLI_sprintfN("alpha_modifiers[\"%s\"]", ((LineStyleModifier *)ptr->data)->name);
 }
 
 static char *rna_LineStyle_thickness_modifier_path(PointerRNA *ptr)
 {
-	return BLI_sprintfN("thickness_modifiers[\"%s\"]", ((LineStyleModifier*)ptr->data)->name);
+	return BLI_sprintfN("thickness_modifiers[\"%s\"]", ((LineStyleModifier *)ptr->data)->name);
 }
 
 static char *rna_LineStyle_geometry_modifier_path(PointerRNA *ptr)
 {
-	return BLI_sprintfN("geometry_modifiers[\"%s\"]", ((LineStyleModifier*)ptr->data)->name);
+	return BLI_sprintfN("geometry_modifiers[\"%s\"]", ((LineStyleModifier *)ptr->data)->name);
 }
 
 static void rna_LineStyleColorModifier_name_set(PointerRNA *ptr, const char *value)
 {
-	FreestyleLineStyle *linestyle= (FreestyleLineStyle*)ptr->id.data;
-	LineStyleModifier *m= (LineStyleModifier*)ptr->data;
+	FreestyleLineStyle *linestyle = (FreestyleLineStyle *)ptr->id.data;
+	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
 	BLI_strncpy_utf8(m->name, value, sizeof(m->name));
-	BLI_uniquename(&linestyle->color_modifiers, m, "ColorModifier", '.', offsetof(LineStyleModifier, name), sizeof(m->name));
+	BLI_uniquename(&linestyle->color_modifiers, m, "ColorModifier", '.',
+	               offsetof(LineStyleModifier, name), sizeof(m->name));
 }
 
 static void rna_LineStyleAlphaModifier_name_set(PointerRNA *ptr, const char *value)
 {
-	FreestyleLineStyle *linestyle= (FreestyleLineStyle*)ptr->id.data;
-	LineStyleModifier *m= (LineStyleModifier*)ptr->data;
+	FreestyleLineStyle *linestyle = (FreestyleLineStyle *)ptr->id.data;
+	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
 	BLI_strncpy_utf8(m->name, value, sizeof(m->name));
-	BLI_uniquename(&linestyle->alpha_modifiers, m, "AlphaModifier", '.', offsetof(LineStyleModifier, name), sizeof(m->name));
+	BLI_uniquename(&linestyle->alpha_modifiers, m, "AlphaModifier", '.',
+	               offsetof(LineStyleModifier, name), sizeof(m->name));
 }
 
 static void rna_LineStyleThicknessModifier_name_set(PointerRNA *ptr, const char *value)
 {
-	FreestyleLineStyle *linestyle= (FreestyleLineStyle*)ptr->id.data;
-	LineStyleModifier *m= (LineStyleModifier*)ptr->data;
+	FreestyleLineStyle *linestyle = (FreestyleLineStyle *)ptr->id.data;
+	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
 	BLI_strncpy_utf8(m->name, value, sizeof(m->name));
-	BLI_uniquename(&linestyle->thickness_modifiers, m, "ThicknessModifier", '.', offsetof(LineStyleModifier, name), sizeof(m->name));
+	BLI_uniquename(&linestyle->thickness_modifiers, m, "ThicknessModifier", '.',
+	               offsetof(LineStyleModifier, name), sizeof(m->name));
 }
 
 static void rna_LineStyleGeometryModifier_name_set(PointerRNA *ptr, const char *value)
 {
-	FreestyleLineStyle *linestyle= (FreestyleLineStyle*)ptr->id.data;
-	LineStyleModifier *m= (LineStyleModifier*)ptr->data;
+	FreestyleLineStyle *linestyle = (FreestyleLineStyle *)ptr->id.data;
+	LineStyleModifier *m = (LineStyleModifier *)ptr->data;
 
 	BLI_strncpy_utf8(m->name, value, sizeof(m->name));
-	BLI_uniquename(&linestyle->geometry_modifiers, m, "GeometryModifier", '.', offsetof(LineStyleModifier, name), sizeof(m->name));
+	BLI_uniquename(&linestyle->geometry_modifiers, m, "GeometryModifier", '.',
+	               offsetof(LineStyleModifier, name), sizeof(m->name));
 }
 
 #else
@@ -231,31 +242,11 @@ static void rna_LineStyleGeometryModifier_name_set(PointerRNA *ptr, const char *
 #include "BLI_math.h"
 
 static void rna_def_modifier_type_common(StructRNA *srna, EnumPropertyItem *modifier_type_items,
-										 char *set_name_func, int blend, int color)
+                                         char *set_name_func, int blend, int color)
 {
 	PropertyRNA *prop;
 
-	static EnumPropertyItem color_blend_items[] = {
-		{MA_RAMP_BLEND, "MIX", 0, "Mix", ""},
-		{MA_RAMP_ADD, "ADD", 0, "Add", ""},
-		{MA_RAMP_MULT, "MULTIPLY", 0, "Multiply", ""},
-		{MA_RAMP_SUB, "SUBTRACT", 0, "Subtract", ""},
-		{MA_RAMP_SCREEN, "SCREEN", 0, "Screen", ""},
-		{MA_RAMP_DIV, "DIVIDE", 0, "Divide", ""},
-		{MA_RAMP_DIFF, "DIFFERENCE", 0, "Difference", ""},
-		{MA_RAMP_DARK, "DARKEN", 0, "Darken", ""},
-		{MA_RAMP_LIGHT, "LIGHTEN", 0, "Lighten", ""},
-		{MA_RAMP_OVERLAY, "OVERLAY", 0, "Overlay", ""},
-		{MA_RAMP_DODGE, "DODGE", 0, "Dodge", ""},
-		{MA_RAMP_BURN, "BURN", 0, "Burn", ""},
-		{MA_RAMP_HUE, "HUE", 0, "Hue", ""},
-		{MA_RAMP_SAT, "SATURATION", 0, "Saturation", ""},
-		{MA_RAMP_VAL, "VALUE", 0, "Value", ""},
-		{MA_RAMP_COLOR, "COLOR", 0, "Color", ""},
-		{MA_RAMP_SOFT, "SOFT_LIGHT", 0, "Soft Light", ""}, 
-		{MA_RAMP_LINEAR, "LINEAR_LIGHT", 0, "Linear Light", ""}, 
-		{0, NULL, 0, NULL, NULL}};
-
+	/* TODO: Check this is not already defined somewhere else, e.g. in nodes... */
 	static EnumPropertyItem value_blend_items[] = {
 		{LS_VALUE_BLEND, "MIX", 0, "Mix", ""},
 		{LS_VALUE_ADD, "ADD", 0, "Add", ""},
@@ -265,15 +256,16 @@ static void rna_def_modifier_type_common(StructRNA *srna, EnumPropertyItem *modi
 		{LS_VALUE_DIFF, "DIFFERENCE", 0, "Divide", ""},
 		{LS_VALUE_MIN, "MININUM", 0, "Minimum", ""}, 
 		{LS_VALUE_MAX, "MAXIMUM", 0, "Maximum", ""}, 
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
-	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "modifier.type");
 	RNA_def_property_enum_items(prop, modifier_type_items);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Modifier Type", "Type of the modifier");
 
-	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "modifier.name");
 	RNA_def_property_string_funcs(prop, NULL, NULL, set_name_func);
 	RNA_def_property_ui_text(prop, "Modifier Name", "Name of the modifier");
@@ -281,24 +273,24 @@ static void rna_def_modifier_type_common(StructRNA *srna, EnumPropertyItem *modi
 	RNA_def_struct_name_property(srna, prop);
 
 	if (blend) {
-		prop= RNA_def_property(srna, "blend", PROP_ENUM, PROP_NONE);
+		prop = RNA_def_property(srna, "blend", PROP_ENUM, PROP_NONE);
 		RNA_def_property_enum_sdna(prop, NULL, "modifier.blend");
-		RNA_def_property_enum_items(prop, (color) ? color_blend_items : value_blend_items);
+		RNA_def_property_enum_items(prop, (color) ? ramp_blend_items : value_blend_items);
 		RNA_def_property_ui_text(prop, "Blend", "Specify how the modifier value is blended into the base value");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-		prop= RNA_def_property(srna, "influence", PROP_FLOAT, PROP_FACTOR);
+		prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_FACTOR);
 		RNA_def_property_float_sdna(prop, NULL, "modifier.influence");
 		RNA_def_property_range(prop, 0.0f, 1.0f);
 		RNA_def_property_ui_text(prop, "Influence", "Influence factor by which the modifier changes the property");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 	}
 
-	prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "modifier.flags", LS_MODIFIER_ENABLED);
 	RNA_def_property_ui_text(prop, "Use", "Enable or disable this modifier during stroke rendering");
 
-	prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "modifier.flags", LS_MODIFIER_EXPANDED);
 	RNA_def_property_ui_text(prop, "Expanded", "True if the modifier tab is expanded");
 }
@@ -306,44 +298,44 @@ static void rna_def_modifier_type_common(StructRNA *srna, EnumPropertyItem *modi
 static void rna_def_color_modifier(StructRNA *srna)
 {
 	rna_def_modifier_type_common(srna, linestyle_color_modifier_type_items,
-		"rna_LineStyleColorModifier_name_set", 1, 1);
+	                             "rna_LineStyleColorModifier_name_set", TRUE, TRUE);
 }
 
 static void rna_def_alpha_modifier(StructRNA *srna)
 {
 	rna_def_modifier_type_common(srna, linestyle_alpha_modifier_type_items,
-		"rna_LineStyleAlphaModifier_name_set", 1, 0);
+	                             "rna_LineStyleAlphaModifier_name_set", TRUE, FALSE);
 }
 
 static void rna_def_thickness_modifier(StructRNA *srna)
 {
 	rna_def_modifier_type_common(srna, linestyle_thickness_modifier_type_items,
-		"rna_LineStyleThicknessModifier_name_set", 1, 0);
+	                             "rna_LineStyleThicknessModifier_name_set", TRUE, FALSE);
 }
 
 static void rna_def_geometry_modifier(StructRNA *srna)
 {
 	rna_def_modifier_type_common(srna, linestyle_geometry_modifier_type_items,
-		"rna_LineStyleGeometryModifier_name_set", 0, 0);
+	                             "rna_LineStyleGeometryModifier_name_set", FALSE, FALSE);
 }
 
 static void rna_def_modifier_color_ramp_common(StructRNA *srna, int range)
 {
 	PropertyRNA *prop;
 
-	prop= RNA_def_property(srna, "color_ramp", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "color_ramp", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "color_ramp");
 	RNA_def_property_struct_type(prop, "ColorRamp");
 	RNA_def_property_ui_text(prop, "Color Ramp", "Color ramp used to change line color");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
 	if (range) {
-		prop= RNA_def_property(srna, "range_min", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "range_min", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "range_min");
 		RNA_def_property_ui_text(prop, "Range Min", "Lower bound of the input range the mapping is applied");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-		prop= RNA_def_property(srna, "range_max", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "range_max", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "range_max");
 		RNA_def_property_ui_text(prop, "Range Max", "Upper bound of the input range the mapping is applied");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
@@ -357,15 +349,16 @@ static void rna_def_modifier_curve_common(StructRNA *srna, int range, int value)
 	static EnumPropertyItem mapping_items[] = {
 		{0, "LINEAR", 0, "Linear", "Use linear mapping"},
 		{LS_MODIFIER_USE_CURVE, "CURVE", 0, "Curve", "Use curve mapping"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
-	prop= RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags");
 	RNA_def_property_enum_items(prop, mapping_items);
 	RNA_def_property_ui_text(prop, "Mapping", "Select the mapping type");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", LS_MODIFIER_INVERT);
 	RNA_def_property_ui_text(prop, "Invert", "Invert the fade-out direction of the linear mapping");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
@@ -377,24 +370,24 @@ static void rna_def_modifier_curve_common(StructRNA *srna, int range, int value)
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
 	if (range) {
-		prop= RNA_def_property(srna, "range_min", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "range_min", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "range_min");
 		RNA_def_property_ui_text(prop, "Range Min", "Lower bound of the input range the mapping is applied");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-		prop= RNA_def_property(srna, "range_max", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "range_max", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "range_max");
 		RNA_def_property_ui_text(prop, "Range Max", "Upper bound of the input range the mapping is applied");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 	}
 
 	if (value) {
-		prop= RNA_def_property(srna, "value_min", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "value_min", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "value_min");
 		RNA_def_property_ui_text(prop, "Value Min", "Minimum output value of the mapping");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-		prop= RNA_def_property(srna, "value_max", PROP_FLOAT, PROP_NONE);
+		prop = RNA_def_property(srna, "value_max", PROP_FLOAT, PROP_NONE);
 		RNA_def_property_float_sdna(prop, NULL, "value_max");
 		RNA_def_property_ui_text(prop, "Value Max", "Maximum output value of the mapping");
 		RNA_def_property_update(prop, NC_LINESTYLE, NULL);
@@ -416,9 +409,10 @@ static void rna_def_modifier_material_common(StructRNA *srna)
 		{LS_MODIFIER_MATERIAL_SPEC_B, "SPEC_B", 0, "Specular Blue", ""},
 		{LS_MODIFIER_MATERIAL_SPEC_HARD, "SPEC_HARD", 0, "Specular Hardness", ""},
 		{LS_MODIFIER_MATERIAL_ALPHA, "ALPHA", 0, "Alpha", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
-	prop= RNA_def_property(srna, "material_attr", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "material_attr", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "mat_attr");
 	RNA_def_property_enum_items(prop, mat_attr_items);
 	RNA_def_property_ui_text(prop, "Material Attribute", "Specify which material attribute is used");
@@ -435,7 +429,8 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna)
 		{LS_MODIFIER_BLUEPRINT_CIRCLES, "CIRCLES", 0, "Circles", "Draw a blueprint using circular contour strokes"},
 		{LS_MODIFIER_BLUEPRINT_ELLIPSES, "ELLIPSES", 0, "Ellipses", "Draw a blueprint using elliptic contour strokes"},
 		{LS_MODIFIER_BLUEPRINT_SQUARES, "SQUARES", 0, "Squares", "Draw a blueprint using square contour strokes"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem transform_pivot_items[] = {
 		{LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER, "CENTER", 0, "Stroke Center", ""},
@@ -443,140 +438,145 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna)
 		{LS_MODIFIER_2D_TRANSFORM_PIVOT_END, "END", 0, "Stroke End", ""},
 		{LS_MODIFIER_2D_TRANSFORM_PIVOT_PARAM, "PARAM", 0, "Stroke Point Parameter", ""},
 		{LS_MODIFIER_2D_TRANSFORM_PIVOT_ABSOLUTE, "ABSOLUTE", 0, "Absolute 2D Point", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
-	srna= RNA_def_struct(brna, "LineStyleModifier", NULL);
+	srna = RNA_def_struct(brna, "LineStyleModifier", NULL);
 	RNA_def_struct_ui_text(srna, "Line Style Modifier", "Base type to define modifiers");
 
 	/* line color modifiers */
 
-	srna= RNA_def_struct(brna, "LineStyleColorModifier", "LineStyleModifier");
+	srna = RNA_def_struct(brna, "LineStyleColorModifier", "LineStyleModifier");
 	RNA_def_struct_sdna(srna, "LineStyleModifier");
 	RNA_def_struct_refine_func(srna, "rna_LineStyle_color_modifier_refine");
 	RNA_def_struct_path_func(srna, "rna_LineStyle_color_modifier_path");
 	RNA_def_struct_ui_text(srna, "Line Style Color Modifier", "Base type to define line color modifiers");
 
-	srna= RNA_def_struct(brna, "LineStyleColorModifier_AlongStroke", "LineStyleColorModifier");
+	srna = RNA_def_struct(brna, "LineStyleColorModifier_AlongStroke", "LineStyleColorModifier");
 	RNA_def_struct_ui_text(srna, "Along Stroke", "Change line color along stroke");
 	rna_def_color_modifier(srna);
-	rna_def_modifier_color_ramp_common(srna, 0);
+	rna_def_modifier_color_ramp_common(srna, FALSE);
 
-	srna= RNA_def_struct(brna, "LineStyleColorModifier_DistanceFromCamera", "LineStyleColorModifier");
+	srna = RNA_def_struct(brna, "LineStyleColorModifier_DistanceFromCamera", "LineStyleColorModifier");
 	RNA_def_struct_ui_text(srna, "Distance from Camera", "Change line color based on the distance from the camera");
 	rna_def_color_modifier(srna);
-	rna_def_modifier_color_ramp_common(srna, 1);
+	rna_def_modifier_color_ramp_common(srna, TRUE);
 
-	srna= RNA_def_struct(brna, "LineStyleColorModifier_DistanceFromObject", "LineStyleColorModifier");
+	srna = RNA_def_struct(brna, "LineStyleColorModifier_DistanceFromObject", "LineStyleColorModifier");
 	RNA_def_struct_ui_text(srna, "Distance from Object", "Change line color based on the distance from an object");
 	rna_def_color_modifier(srna);
-	rna_def_modifier_color_ramp_common(srna, 1);
+	rna_def_modifier_color_ramp_common(srna, TRUE);
 
-	prop= RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target");
 	RNA_def_property_struct_type(prop, "Object");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Target", "Target object from which the distance is measured");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleColorModifier_Material", "LineStyleColorModifier");
+	srna = RNA_def_struct(brna, "LineStyleColorModifier_Material", "LineStyleColorModifier");
 	RNA_def_struct_ui_text(srna, "Material", "Change line color based on a material attribute");
 	rna_def_color_modifier(srna);
 	rna_def_modifier_material_common(srna);
-	rna_def_modifier_color_ramp_common(srna, 0);
+	rna_def_modifier_color_ramp_common(srna, FALSE);
 
-	prop= RNA_def_property(srna, "use_ramp", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_ramp", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", LS_MODIFIER_USE_RAMP);
 	RNA_def_property_ui_text(prop, "Ramp", "Use color ramp to map the BW average into an RGB color");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
 	/* alpha transparency modifiers */
 
-	srna= RNA_def_struct(brna, "LineStyleAlphaModifier", "LineStyleModifier");
+	srna = RNA_def_struct(brna, "LineStyleAlphaModifier", "LineStyleModifier");
 	RNA_def_struct_sdna(srna, "LineStyleModifier");
 	RNA_def_struct_refine_func(srna, "rna_LineStyle_alpha_modifier_refine");
 	RNA_def_struct_path_func(srna, "rna_LineStyle_alpha_modifier_path");
 	RNA_def_struct_ui_text(srna, "Line Style Alpha Modifier", "Base type to define alpha transparency modifiers");
 
-	srna= RNA_def_struct(brna, "LineStyleAlphaModifier_AlongStroke", "LineStyleAlphaModifier");
+	srna = RNA_def_struct(brna, "LineStyleAlphaModifier_AlongStroke", "LineStyleAlphaModifier");
 	RNA_def_struct_ui_text(srna, "Along Stroke", "Change alpha transparency along stroke");
 	rna_def_alpha_modifier(srna);
-	rna_def_modifier_curve_common(srna, 0, 0);
+	rna_def_modifier_curve_common(srna, FALSE, FALSE);
 
-	srna= RNA_def_struct(brna, "LineStyleAlphaModifier_DistanceFromCamera", "LineStyleAlphaModifier");
-	RNA_def_struct_ui_text(srna, "Distance from Camera", "Change alpha transparency based on the distance from the camera");
+	srna = RNA_def_struct(brna, "LineStyleAlphaModifier_DistanceFromCamera", "LineStyleAlphaModifier");
+	RNA_def_struct_ui_text(srna, "Distance from Camera",
+	                       "Change alpha transparency based on the distance from the camera");
 	rna_def_alpha_modifier(srna);
-	rna_def_modifier_curve_common(srna, 1, 0);
+	rna_def_modifier_curve_common(srna, TRUE, FALSE);
 
 	srna= RNA_def_struct(brna, "LineStyleAlphaModifier_DistanceFromObject", "LineStyleAlphaModifier");
-	RNA_def_struct_ui_text(srna, "Distance from Object", "Change alpha transparency based on the distance from an object");
+	RNA_def_struct_ui_text(srna, "Distance from Object",
+	                       "Change alpha transparency based on the distance from an object");
 	rna_def_alpha_modifier(srna);
-	rna_def_modifier_curve_common(srna, 1, 0);
+	rna_def_modifier_curve_common(srna, TRUE, FALSE);
 
-	prop= RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target");
 	RNA_def_property_struct_type(prop, "Object");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Target", "Target object from which the distance is measured");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleAlphaModifier_Material", "LineStyleAlphaModifier");
+	srna = RNA_def_struct(brna, "LineStyleAlphaModifier_Material", "LineStyleAlphaModifier");
 	RNA_def_struct_ui_text(srna, "Material", "Change alpha transparency based on a material attribute");
 	rna_def_alpha_modifier(srna);
 	rna_def_modifier_material_common(srna);
-	rna_def_modifier_curve_common(srna, 0, 0);
+	rna_def_modifier_curve_common(srna, FALSE, FALSE);
 
 	/* line thickness modifiers */
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier", "LineStyleModifier");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier", "LineStyleModifier");
 	RNA_def_struct_sdna(srna, "LineStyleModifier");
 	RNA_def_struct_refine_func(srna, "rna_LineStyle_thickness_modifier_refine");
 	RNA_def_struct_path_func(srna, "rna_LineStyle_thickness_modifier_path");
 	RNA_def_struct_ui_text(srna, "Line Style Thickness Modifier", "Base type to define line thickness modifiers");
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier_AlongStroke", "LineStyleThicknessModifier");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier_AlongStroke", "LineStyleThicknessModifier");
 	RNA_def_struct_ui_text(srna, "Along Stroke", "Change line thickness along stroke");
 	rna_def_thickness_modifier(srna);
-	rna_def_modifier_curve_common(srna, 0, 1);
+	rna_def_modifier_curve_common(srna, FALSE, TRUE);
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier_DistanceFromCamera", "LineStyleThicknessModifier");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier_DistanceFromCamera", "LineStyleThicknessModifier");
 	RNA_def_struct_ui_text(srna, "Distance from Camera", "Change line thickness based on the distance from the camera");
 	rna_def_thickness_modifier(srna);
-	rna_def_modifier_curve_common(srna, 1, 1);
+	rna_def_modifier_curve_common(srna, TRUE, TRUE);
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier_DistanceFromObject", "LineStyleThicknessModifier");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier_DistanceFromObject", "LineStyleThicknessModifier");
 	RNA_def_struct_ui_text(srna, "Distance from Object", "Change line thickness based on the distance from an object");
 	rna_def_thickness_modifier(srna);
-	rna_def_modifier_curve_common(srna, 1, 1);
+	rna_def_modifier_curve_common(srna, TRUE, TRUE);
 
-	prop= RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target");
 	RNA_def_property_struct_type(prop, "Object");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Target", "Target object from which the distance is measured");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier_Material", "LineStyleThicknessModifier");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier_Material", "LineStyleThicknessModifier");
 	RNA_def_struct_ui_text(srna, "Material", "Change line thickness based on a material attribute");
 	rna_def_thickness_modifier(srna);
 	rna_def_modifier_material_common(srna);
-	rna_def_modifier_curve_common(srna, 0, 1);
+	rna_def_modifier_curve_common(srna, FALSE, TRUE);
 
-	srna= RNA_def_struct(brna, "LineStyleThicknessModifier_Calligraphy", "LineStyleThicknessModifier");
-	RNA_def_struct_ui_text(srna, "Calligraphy", "Change line thickness so that stroke looks like made with a calligraphic pen");
+	srna = RNA_def_struct(brna, "LineStyleThicknessModifier_Calligraphy", "LineStyleThicknessModifier");
+	RNA_def_struct_ui_text(srna, "Calligraphy",
+	                       "Change line thickness so that stroke looks like made with a calligraphic pen");
 	rna_def_thickness_modifier(srna);
 
-	prop= RNA_def_property(srna, "orientation", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "orientation", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "orientation");
 	RNA_def_property_ui_text(prop, "Orientation", "Angle of the main direction");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "min_thickness", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "min_thickness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min_thickness");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
-	RNA_def_property_ui_text(prop, "Min Thickness", "Minimum thickness in the direction perpendicular to the main direction");
+	RNA_def_property_ui_text(prop, "Min Thickness",
+	                         "Minimum thickness in the direction perpendicular to the main direction");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "max_thickness", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "max_thickness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max_thickness");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Max Thickness", "Maximum thickness in the main direction");
@@ -584,273 +584,286 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna)
 
 	/* geometry modifiers */
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier", "LineStyleModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier", "LineStyleModifier");
 	RNA_def_struct_sdna(srna, "LineStyleModifier");
 	RNA_def_struct_refine_func(srna, "rna_LineStyle_geometry_modifier_refine");
 	RNA_def_struct_path_func(srna, "rna_LineStyle_geometry_modifier_path");
 	RNA_def_struct_ui_text(srna, "Line Style Geometry Modifier", "Base type to define stroke geometry modifiers");
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_Sampling", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Sampling", "Specify a new sampling value that determines the resolution of stroke polylines");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_Sampling", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Sampling",
+	                       "Specify a new sampling value that determines the resolution of stroke polylines");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "sampling", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "sampling", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sampling");
 	RNA_def_property_ui_text(prop, "Sampling", "New sampling value to be used for subsequent modifiers");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_BezierCurve", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Bezier Curve", "Replace stroke backbone geometry by a Bezier curve approximation of the original backbone geometry");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_BezierCurve", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Bezier Curve",
+	                       "Replace stroke backbone geometry by a Bezier curve approximation of the "
+	                       "original backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "error", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "error", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "error");
-	RNA_def_property_ui_text(prop, "Error", "Maximum distance allowed between the new Bezier curve and the original backbone geometry)");
+	RNA_def_property_ui_text(prop, "Error",
+	                         "Maximum distance allowed between the new Bezier curve and the "
+	                         "original backbone geometry)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_SinusDisplacement", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_SinusDisplacement", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "Sinus Displacement", "Add sinus displacement to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "wavelength", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "wavelength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "wavelength");
 	RNA_def_property_ui_text(prop, "Wavelength", "Wavelength of the sinus displacement");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "amplitude");
 	RNA_def_property_ui_text(prop, "Amplitude", "Amplitude of the sinus displacement");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "phase", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "phase", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "phase");
 	RNA_def_property_ui_text(prop, "Phase", "Phase of the sinus displacement");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_SpatialNoise", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_SpatialNoise", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "Spatial Noise", "Add spatial noise to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "amplitude");
 	RNA_def_property_ui_text(prop, "Amplitude", "Amplitude of the spatial noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scale");
 	RNA_def_property_ui_text(prop, "Scale", "Scale of the spatial noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "octaves");
 	RNA_def_property_ui_text(prop, "Octaves", "Number of octaves (i.e., the amount of detail of the spatial noise)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", LS_MODIFIER_SPATIAL_NOISE_SMOOTH);
 	RNA_def_property_ui_text(prop, "Smooth", "If true, the spatial noise is smooth");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "pure_random", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "pure_random", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", LS_MODIFIER_SPATIAL_NOISE_PURERANDOM);
 	RNA_def_property_ui_text(prop, "Pure Random", "If true, the spatial noise does not show any coherence");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_PerlinNoise1D", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_PerlinNoise1D", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "Perlin Noise 1D", "Add one-dimensional Perlin noise to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "frequency", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "frequency", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "frequency");
 	RNA_def_property_ui_text(prop, "Frequency", "Frequency of the Perlin noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "amplitude");
 	RNA_def_property_ui_text(prop, "Amplitude", "Amplitude of the Perlin noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "octaves");
 	RNA_def_property_ui_text(prop, "Octaves", "Number of octaves (i.e., the amount of detail of the Perlin noise)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
 	RNA_def_property_ui_text(prop, "Angle", "Displacement direction");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "seed");
-	RNA_def_property_ui_text(prop, "Seed", "Seed for random number generation.  If negative, time is used as a seed instead");
+	RNA_def_property_ui_text(prop, "Seed",
+	                         "Seed for random number generation (if negative, time is used as a seed instead)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_PerlinNoise2D", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_PerlinNoise2D", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "Perlin Noise 2D", "Add two-dimensional Perlin noise to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "frequency", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "frequency", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "frequency");
 	RNA_def_property_ui_text(prop, "Frequency", "Frequency of the Perlin noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "amplitude");
 	RNA_def_property_ui_text(prop, "Amplitude", "Amplitude of the Perlin noise");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "octaves", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "octaves");
 	RNA_def_property_ui_text(prop, "Octaves", "Number of octaves (i.e., the amount of detail of the Perlin noise)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
 	RNA_def_property_ui_text(prop, "Angle", "Displacement direction");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "seed");
-	RNA_def_property_ui_text(prop, "Seed", "Seed for random number generation.  If negative, time is used as a seed instead");
+	RNA_def_property_ui_text(prop, "Seed",
+	                         "Seed for random number generation (if negative, time is used as a seed instead)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_BackboneStretcher", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_BackboneStretcher", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "Backbone Stretcher", "Stretch the beginning and the end of stroke backbone");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "backbone_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "backbone_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "backbone_length");
 	RNA_def_property_ui_text(prop, "Backbone Length", "Amount of backbone stretching");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_TipRemover", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Tip Remover", "Remove a piece of stroke at the beginning and the end of stroke backbone");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_TipRemover", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Tip Remover",
+	                       "Remove a piece of stroke at the beginning and the end of stroke backbone");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "tip_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "tip_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "tip_length");
 	RNA_def_property_ui_text(prop, "Tip Length", "Length of tips to be removed");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_Polygonalization", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Polygonalization", "Modify the stroke geometry so that it looks more \"polygonal\"");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_Polygonalization", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Polygonalization", "Modify the stroke geometry so that it looks more 'polygonal'");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "error", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "error", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "error");
-	RNA_def_property_ui_text(prop, "Error", "Maximum distance between the original stroke and its polygonal approximation");
+	RNA_def_property_ui_text(prop, "Error",
+	                         "Maximum distance between the original stroke and its polygonal approximation");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_GuidingLines", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Guiding Lines", "Modify the stroke geometry so that it corresponds to its main direction line");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_GuidingLines", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Guiding Lines",
+	                       "Modify the stroke geometry so that it corresponds to its main direction line");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "offset");
-	RNA_def_property_ui_text(prop, "Offset", "Displacement that is applied to the main direction line along its normal");
+	RNA_def_property_ui_text(prop, "Offset",
+	                         "Displacement that is applied to the main direction line along its normal");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_Blueprint", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "Blueprint", "Produce a blueprint using circular, elliptic, and square contour strokes");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_Blueprint", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "Blueprint",
+	                       "Produce a blueprint using circular, elliptic, and square contour strokes");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "shape", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "shape", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags");
 	RNA_def_property_enum_items(prop, blueprint_shape_items);
 	RNA_def_property_ui_text(prop, "Shape", "Select the shape of blueprint contour strokes");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "rounds", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "rounds", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "rounds");
 	RNA_def_property_range(prop, 1, 1000);
 	RNA_def_property_ui_text(prop, "Rounds", "Number of rounds in contour strokes");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "backbone_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "backbone_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "backbone_length");
 	RNA_def_property_ui_text(prop, "Backbone Length", "Amount of backbone stretching");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "random_radius", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "random_radius", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "random_radius");
 	RNA_def_property_ui_text(prop, "Random Radius", "Randomness of the radius");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "random_center", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "random_center", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "random_center");
 	RNA_def_property_ui_text(prop, "Random Center", "Randomness of the center");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "random_backbone", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "random_backbone", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "random_backbone");
 	RNA_def_property_ui_text(prop, "Random Backbone", "Randomness of the backbone stretching");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_2DOffset", "LineStyleGeometryModifier");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_2DOffset", "LineStyleGeometryModifier");
 	RNA_def_struct_ui_text(srna, "2D Offset", "Add two-dimensional offsets to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "start", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "start");
 	RNA_def_property_ui_text(prop, "Start", "Displacement that is applied from the beginning of the stroke");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "end", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "end", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "end");
 	RNA_def_property_ui_text(prop, "End", "Displacement that is applied from the end of the stroke");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "x", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "x");
 	RNA_def_property_ui_text(prop, "X", "Displacement that is applied to the X coordinates of stroke vertices");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "y");
 	RNA_def_property_ui_text(prop, "Y", "Displacement that is applied to the Y coordinates of stroke vertices");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	srna= RNA_def_struct(brna, "LineStyleGeometryModifier_2DTransform", "LineStyleGeometryModifier");
-	RNA_def_struct_ui_text(srna, "2D Transform", "Apply two-dimensional scaling and rotation to stroke backbone geometry");
+	srna = RNA_def_struct(brna, "LineStyleGeometryModifier_2DTransform", "LineStyleGeometryModifier");
+	RNA_def_struct_ui_text(srna, "2D Transform",
+	                       "Apply two-dimensional scaling and rotation to stroke backbone geometry");
 	rna_def_geometry_modifier(srna);
 
-	prop= RNA_def_property(srna, "pivot", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "pivot", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "pivot");
 	RNA_def_property_enum_items(prop, transform_pivot_items);
 	RNA_def_property_ui_text(prop, "Pivot", "Pivot of scaling and rotation operations");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "scale_x", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "scale_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scale_x");
 	RNA_def_property_ui_text(prop, "Scale X", "Scaling factor that is applied along the X axis");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "scale_y", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "scale_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scale_y");
 	RNA_def_property_ui_text(prop, "Scale Y", "Scaling factor that is applied along the Y axis");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
 	RNA_def_property_ui_text(prop, "Rotation Angle", "Rotation angle");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "pivot_u", PROP_FLOAT, PROP_FACTOR);
+	prop = RNA_def_property(srna, "pivot_u", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "pivot_u");
 	RNA_def_property_range(prop, 0.f, 1.f);
-	RNA_def_property_ui_text(prop, "Stroke Point Parameter", "Pivot in terms of the stroke point parameter u (0 <= u <= 1)");
+	RNA_def_property_ui_text(prop, "Stroke Point Parameter",
+	                         "Pivot in terms of the stroke point parameter u (0 <= u <= 1)");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "pivot_x", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "pivot_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "pivot_x");
 	RNA_def_property_ui_text(prop, "Pivot X", "2D X coordinate of the absolute pivot");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "pivot_y", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "pivot_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "pivot_y");
 	RNA_def_property_ui_text(prop, "Pivot Y", "2D Y coordinate of the absolute pivot");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
-
 }
 
 static void rna_def_linestyle(BlenderRNA *brna)
@@ -865,253 +878,261 @@ static void rna_def_linestyle(BlenderRNA *brna)
 		{LS_PANEL_THICKNESS, "THICKNESS", 0, "Thickness", "Show the panel for line thickness options"},
 		{LS_PANEL_GEOMETRY, "GEOMETRY", 0, "Geometry", "Show the panel for stroke geometry options"},
 		{LS_PANEL_MISC, "MISC", 0, "Misc", "Show the panel for miscellaneous options"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	static EnumPropertyItem chaining_items[] = {
 		{LS_CHAINING_PLAIN, "PLAIN", 0, "Plain", "Plain chaining"},
 		{LS_CHAINING_SKETCHY, "SKETCHY", 0, "Sketchy", "Sketchy chaining with a multiple touch"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	static EnumPropertyItem cap_items[] = {
 		{LS_CAPS_BUTT, "BUTT", 0, "Butt", "Butt cap (flat)"},
 		{LS_CAPS_ROUND, "ROUND", 0, "Round", "Round cap (half-circle)"},
 		{LS_CAPS_SQUARE, "SQUARE", 0, "Square", "Square cap (flat and extended)"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	static EnumPropertyItem thickness_position_items[] = {
 		{LS_THICKNESS_CENTER, "CENTER", 0, "Center", "Stroke is centered along stroke geometry"},
 		{LS_THICKNESS_INSIDE, "INSIDE", 0, "Inside", "Stroke is drawn inside stroke geometry"},
 		{LS_THICKNESS_OUTSIDE, "OUTSIDE", 0, "Outside", "Stroke is drawn outside stroke geometry"},
 		{LS_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative", "Stroke thinkness is split by a user-defined ratio"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
-	srna= RNA_def_struct(brna, "FreestyleLineStyle", "ID");
+	srna = RNA_def_struct(brna, "FreestyleLineStyle", "ID");
 	RNA_def_struct_ui_text(srna, "Freestyle Line Style", "Freestyle line style, reusable by multiple line sets");
 	RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); /* FIXME: use a proper icon */
 
-	prop= RNA_def_property(srna, "panel", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "panel", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "panel");
 	RNA_def_property_enum_items(prop, panel_items);
 	RNA_def_property_ui_text(prop, "Panel", "Select the property panel to be shown");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
+	prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "r");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Color", "Base line color, possibly modified by line color modifiers");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_FACTOR);
+	prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "alpha");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Alpha", "Base alpha transparency, possibly modified by alpha transparency modifiers");
+	RNA_def_property_ui_text(prop, "Alpha",
+	                         "Base alpha transparency, possibly modified by alpha transparency modifiers");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "thickness", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "thickness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "thickness");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Thickness", "Base line thickness, possibly modified by line thickness modifiers");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "thickness_position", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "thickness_position", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "thickness_position");
 	RNA_def_property_enum_items(prop, thickness_position_items);
 	RNA_def_property_ui_text(prop, "Thickness Position", "Select the position of stroke thickness");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "thickness_ratio", PROP_FLOAT, PROP_FACTOR);
+	prop = RNA_def_property(srna, "thickness_ratio", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "thickness_ratio");
 	RNA_def_property_range(prop, 0.f, 1.f);
-	RNA_def_property_ui_text(prop, "Thickness Ratio", "A number between 0 (inside) and 1 (outside) specifying the relative position of stroke thickness");
+	RNA_def_property_ui_text(prop, "Thickness Ratio",
+	                         "A number between 0 (inside) and 1 (outside) specifying the relative position of "
+	                         "stroke thickness");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "color_modifiers", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "color_modifiers", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "color_modifiers", NULL);
 	RNA_def_property_struct_type(prop, "LineStyleColorModifier");
 	RNA_def_property_ui_text(prop, "Color Modifiers", "List of line color modifiers");
 
-	prop= RNA_def_property(srna, "alpha_modifiers", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "alpha_modifiers", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "alpha_modifiers", NULL);
 	RNA_def_property_struct_type(prop, "LineStyleAlphaModifier");
 	RNA_def_property_ui_text(prop, "Alpha Modifiers", "List of alpha trancparency modifiers");
 
-	prop= RNA_def_property(srna, "thickness_modifiers", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "thickness_modifiers", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "thickness_modifiers", NULL);
 	RNA_def_property_struct_type(prop, "LineStyleThicknessModifier");
 	RNA_def_property_ui_text(prop, "Thickness Modifiers", "List of line thickness modifiers");
 
-	prop= RNA_def_property(srna, "use_chaining", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_chaining", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", LS_NO_CHAINING);
 	RNA_def_property_ui_text(prop, "Chaining", "Enable chaining of feature edges");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "chaining", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "chaining", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "chaining");
 	RNA_def_property_enum_items(prop, chaining_items);
 	RNA_def_property_ui_text(prop, "Chaining", "Select the way how feature edges are jointed to form chains");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "rounds", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "rounds", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "rounds");
 	RNA_def_property_range(prop, 1, 1000);
 	RNA_def_property_ui_text(prop, "Rounds", "Number of rounds in a sketchy multiple touch");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "geometry_modifiers", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "geometry_modifiers", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "geometry_modifiers", NULL);
 	RNA_def_property_struct_type(prop, "LineStyleGeometryModifier");
 	RNA_def_property_ui_text(prop, "Geometry Modifiers", "List of stroke geometry modifiers");
 
-	prop= RNA_def_property(srna, "same_object", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "same_object", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_SAME_OBJECT);
 	RNA_def_property_ui_text(prop, "Same Object", "If true, only feature edges of the same object are joined");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_split_length", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_split_length", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_SPLIT_LENGTH);
 	RNA_def_property_ui_text(prop, "Use Split Length", "Enable chain splitting by curvilinear 2D length");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "split_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "split_length");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Split Length", "Curvilinear 2D length for chain splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_min_angle", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_min_angle", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_MIN_2D_ANGLE);
-	RNA_def_property_ui_text(prop, "Use Min 2D Angle", "Split chains at points with angles smaller than the minimum 2D angle");
+	RNA_def_property_ui_text(prop, "Use Min 2D Angle",
+	                         "Split chains at points with angles smaller than the minimum 2D angle");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "min_angle", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "min_angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "min_angle");
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f));
 	RNA_def_property_ui_text(prop, "Min 2D Angle", "Minimum 2D angle for splitting chains");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_max_angle", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_max_angle", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_MAX_2D_ANGLE);
-	RNA_def_property_ui_text(prop, "Use Max 2D Angle", "Split chains at points with angles larger than the maximum 2D angle");
+	RNA_def_property_ui_text(prop, "Use Max 2D Angle",
+	                         "Split chains at points with angles larger than the maximum 2D angle");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "max_angle", PROP_FLOAT, PROP_ANGLE);
+	prop = RNA_def_property(srna, "max_angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "max_angle");
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f));
 	RNA_def_property_ui_text(prop, "Max 2D Angle", "Maximum 2D angle for splitting chains");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_min_length", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_min_length", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_MIN_2D_LENGTH);
 	RNA_def_property_ui_text(prop, "Use Min 2D Length", "Enable the selection of chains by a minimum 2D length");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "min_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "min_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min_length");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Min 2D Length", "Minimum curvilinear 2D length for the selection of chains");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_max_length", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_max_length", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_MAX_2D_LENGTH);
 	RNA_def_property_ui_text(prop, "Use Max 2D Length", "Enable the selection of chains by a maximum 2D length");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "max_length", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "max_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max_length");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Max 2D Length", "Maximum curvilinear 2D length for the selection of chains");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_split_pattern", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_split_pattern", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_SPLIT_PATTERN);
 	RNA_def_property_ui_text(prop, "Use Split Pattern", "Enable chain splitting by dashed line patterns");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_dash1", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_dash1", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_dash1");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Dash 1", "Length of the 1st dash for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_gap1", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_gap1", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_gap1");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Gap 1", "Length of the 1st gap for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_dash2", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_dash2", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_dash2");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Dash 2", "Length of the 2nd dash for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_gap2", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_gap2", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_gap2");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Gap 2", "Length of the 2nd gap for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_dash3", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_dash3", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_dash3");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Dash 3", "Length of the 3rd dash for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "split_gap3", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "split_gap3", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "split_gap3");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Split Gap 3", "Length of the 3rd gap for splitting");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "material_boundary", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "material_boundary", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_MATERIAL_BOUNDARY);
 	RNA_def_property_ui_text(prop, "Material Boundary", "If true, chains of feature edges are split at material boundaries");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "use_dashed_line", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_dashed_line", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_DASHED_LINE);
 	RNA_def_property_ui_text(prop, "Dashed Line", "Enable or disable dashed line");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "caps", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "caps", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "caps");
 	RNA_def_property_enum_items(prop, cap_items);
 	RNA_def_property_ui_text(prop, "Cap", "Select the shape of both ends of strokes");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "dash1", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "dash1", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "dash1");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Dash 1", "Length of the 1st dash for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "gap1", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "gap1", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "gap1");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Gap 1", "Length of the 1st gap for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "dash2", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "dash2", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "dash2");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Dash 2", "Length of the 2nd dash for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "gap2", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "gap2", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "gap2");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Gap 2", "Length of the 2nd gap for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "dash3", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "dash3", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "dash3");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Dash 3", "Length of the 3rd dash for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
 
-	prop= RNA_def_property(srna, "gap3", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "gap3", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "gap3");
 	RNA_def_property_range(prop, 0, USHRT_MAX);
 	RNA_def_property_ui_text(prop, "Gap 3", "Length of the 3rd gap for dashed lines");
 	RNA_def_property_update(prop, NC_LINESTYLE, NULL);
-
 }
 
 void RNA_def_linestyle(BlenderRNA *brna)