style cleanup: mostly whitespace in rna

1 files changed, 120 insertions, 119 deletions

diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 4c2af854f67..09cbf8bd90a 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -51,8 +51,8 @@ BlenderDefRNA DefRNA = {NULL, {NULL, NULL}, {NULL, NULL}, NULL, 0, 0, 0, 1};
 /* Duplicated code since we can't link in blenkernel or blenlib */
 
 #ifndef MIN2
-#define MIN2(x,y) ((x)<(y)? (x): (y))
-#define MAX2(x,y) ((x)>(y)? (x): (y))
+#define MIN2(x, y) ((x) < (y) ? (x) : (y))
+#define MAX2(x, y) ((x) > (y) ? (x) : (y))
 #endif
 
 /* pedantic check for '.', do this since its a hassle for translators */
@@ -268,11 +268,11 @@ static ContainerDefRNA *rna_find_container_def(ContainerRNA *cont)
 		return NULL;
 	}
 
-	ds = rna_find_struct_def((StructRNA*)cont);
+	ds = rna_find_struct_def((StructRNA *)cont);
 	if (ds)
 		return &ds->cont;
 
-	dfunc = rna_find_function_def((FunctionRNA*)cont);
+	dfunc = rna_find_function_def((FunctionRNA *)cont);
 	if (dfunc)
 		return &dfunc->cont;
 
@@ -293,20 +293,20 @@ static int rna_member_cmp(const char *name, const char *oname)
 	int a = 0;
 	
 	/* compare without pointer or array part */
-	while (name[0] =='*')
+	while (name[0] == '*')
 		name++;
-	while (oname[0] =='*')
+	while (oname[0] == '*')
 		oname++;
 	
 	while (1) {
-		if (name[a] =='[' && oname[a] == 0) return 1;
-		if (name[a] =='[' && oname[a] =='[') return 1;
+		if (name[a] == '[' && oname[a] == 0) return 1;
+		if (name[a] == '[' && oname[a] == '[') return 1;
 		if (name[a] == 0) break;
 		if (name[a] != oname[a]) return 0;
 		a++;
 	}
 	if (name[a] == 0 && oname[a] == '.') return 2;
-	if (name[a] == 0 && oname[a] == '-' && oname[a+1] == '>') return 3;
+	if (name[a] == 0 && oname[a] == '-' && oname[a + 1] == '>') return 3;
 
 	return (name[a] == oname[a]);
 }
@@ -325,7 +325,7 @@ static int rna_find_sdna_member(SDNA *sdna, const char *structname, const char *
 	totmember = sp[1];
 	sp += 2;
 
-	for (a = 0; a<totmember; a++, sp += 2) {
+	for (a = 0; a < totmember; a++, sp += 2) {
 		dnaname = sdna->names[sp[1]];
 
 		cmp = rna_member_cmp(dnaname, membername);
@@ -400,11 +400,11 @@ static int rna_validate_identifier(const char *identifier, char *error, int prop
 			}
 		}
 		
-		if (identifier[a] =='_') {
+		if (identifier[a] == '_') {
 			continue;
 		}
 
-		if (identifier[a] ==' ') {
+		if (identifier[a] == ' ') {
 			strcpy(error, "spaces are not okay in identifier names");
 			return 0;
 		}
@@ -492,9 +492,9 @@ void RNA_define_verify_sdna(int verify)
 void RNA_struct_free_extension(StructRNA *srna, ExtensionRNA *ext)
 {
 #ifdef RNA_RUNTIME
-	ext->free(ext->data);			/* decref's the PyObject that the srna owns */
-	RNA_struct_blender_type_set(srna, NULL); /* this gets accessed again - XXX fixme */
-	RNA_struct_py_type_set(srna, NULL);	/* NULL the srna's value so RNA_struct_free wont complain of a leak */
+	ext->free(ext->data);                     /* decref's the PyObject that the srna owns */
+	RNA_struct_blender_type_set(srna, NULL);  /* this gets accessed again - XXX fixme */
+	RNA_struct_py_type_set(srna, NULL);       /* NULL the srna's value so RNA_struct_free wont complain of a leak */
 #endif
 }
 
@@ -505,12 +505,13 @@ void RNA_struct_free(BlenderRNA *brna, StructRNA *srna)
 	PropertyRNA *prop, *nextprop;
 	PropertyRNA *parm, *nextparm;
 
-	/*
+#if 0
 	if (srna->flag & STRUCT_RUNTIME) {
 		if (RNA_struct_py_type_get(srna)) {
 			fprintf(stderr, "%s '%s' freed while holding a python reference\n", __func__, srna->identifier);
 		}
-	} */
+	}
+#endif
 
 	for (prop = srna->cont.properties.first; prop; prop = nextprop) {
 		nextprop = prop->next;
@@ -691,7 +692,7 @@ StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char *
 		}
 		else {
 #ifdef RNA_RUNTIME
-			CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
+			CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
 			cprop->begin = rna_builtin_properties_begin;
 			cprop->next = rna_builtin_properties_next;
 			cprop->get = rna_builtin_properties_get;
@@ -709,7 +710,7 @@ StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char *
 		}
 		else {
 #ifdef RNA_RUNTIME
-			PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
+			PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
 			pprop->get = rna_builtin_type_get;
 			pprop->type = &RNA_Struct;
 #endif
@@ -920,20 +921,20 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier
 			}
 			break;
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 
-			iprop->hardmin = (subtype == PROP_UNSIGNED)? 0: INT_MIN;
+			iprop->hardmin = (subtype == PROP_UNSIGNED) ? 0 : INT_MIN;
 			iprop->hardmax = INT_MAX;
 
-			iprop->softmin = (subtype == PROP_UNSIGNED)? 0: -10000; /* rather arbitrary .. */
+			iprop->softmin = (subtype == PROP_UNSIGNED) ? 0 : -10000; /* rather arbitrary .. */
 			iprop->softmax = 10000;
 			iprop->step = 1;
 			break;
 		}
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 
-			fprop->hardmin = (subtype == PROP_UNSIGNED)? 0.0f: -FLT_MAX;
+			fprop->hardmin = (subtype == PROP_UNSIGNED) ? 0.0f : -FLT_MAX;
 			fprop->hardmax = FLT_MAX;
 
 			if (ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA)) {
@@ -945,7 +946,7 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier
 				fprop->softmax = fprop->hardmax = 1.0f;
 			}
 			else {
-				fprop->softmin = (subtype == PROP_UNSIGNED)? 0.0f: -10000.0f; /* rather arbitrary .. */
+				fprop->softmin = (subtype == PROP_UNSIGNED) ? 0.0f : -10000.0f; /* rather arbitrary .. */
 				fprop->softmax = 10000.0f;
 			}
 			fprop->step = 10;
@@ -953,7 +954,7 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier
 			break;
 		}
 		case PROP_STRING: {
-			StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+			StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 
 			sprop->defaultvalue = "";
 			break;
@@ -1038,10 +1039,10 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier
 		}
 	}
 	else {
-		prop->flag |= PROP_IDPROPERTY|PROP_RUNTIME;
+		prop->flag |= PROP_IDPROPERTY | PROP_RUNTIME;
 #ifdef RNA_RUNTIME
 		if (cont->prophash)
-			BLI_ghash_insert(cont->prophash, (void*)prop->identifier, prop);
+			BLI_ghash_insert(cont->prophash, (void *)prop->identifier, prop);
 #endif
 	}
 
@@ -1069,14 +1070,14 @@ void RNA_def_property_array(PropertyRNA *prop, int length)
 {
 	StructRNA *srna = DefRNA.laststruct;
 
-	if (length<0) {
+	if (length < 0) {
 		fprintf(stderr, "%s: \"%s.%s\", array length must be zero of greater.\n", __func__,
 		        srna->identifier, prop->identifier);
 		DefRNA.error = 1;
 		return;
 	}
 
-	if (length>RNA_MAX_ARRAY_LENGTH) {
+	if (length > RNA_MAX_ARRAY_LENGTH) {
 		fprintf(stderr, "%s: \"%s.%s\", array length must be smaller than %d.\n", __func__,
 		        srna->identifier, prop->identifier, RNA_MAX_ARRAY_LENGTH);
 		DefRNA.error = 1;
@@ -1134,10 +1135,10 @@ void RNA_def_property_multi_array(PropertyRNA *prop, int dimension, const int le
 	prop->totarraylength = 0;
 
 	if (length) {
-		memcpy(prop->arraylength, length, sizeof(int)*dimension);
+		memcpy(prop->arraylength, length, sizeof(int) * dimension);
 
 		prop->totarraylength = length[0];
-		for (i = 1; i<dimension; i++)
+		for (i = 1; i < dimension; i++)
 			prop->totarraylength *= length[i];
 	}
 	else
@@ -1167,14 +1168,14 @@ void RNA_def_property_ui_range(PropertyRNA *prop, double min, double max, double
 
 	switch (prop->type) {
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 			iprop->softmin = (int)min;
 			iprop->softmax = (int)max;
 			iprop->step = (int)step;
 			break;
 		}
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 			fprop->softmin = (float)min;
 			fprop->softmax = (float)max;
 			fprop->step = (float)step;
@@ -1195,7 +1196,7 @@ void RNA_def_property_range(PropertyRNA *prop, double min, double max)
 
 	switch (prop->type) {
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 			iprop->hardmin = (int)min;
 			iprop->hardmax = (int)max;
 			iprop->softmin = MAX2((int)min, iprop->hardmin);
@@ -1203,7 +1204,7 @@ void RNA_def_property_range(PropertyRNA *prop, double min, double max)
 			break;
 		}
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 			fprop->hardmin = (float)min;
 			fprop->hardmax = (float)max;
 			fprop->softmin = MAX2((float)min, fprop->hardmin);
@@ -1228,13 +1229,13 @@ void RNA_def_property_struct_type(PropertyRNA *prop, const char *type)
 
 	switch (prop->type) {
 		case PROP_POINTER: {
-			PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
-			pprop->type = (StructRNA*)type;
+			PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
+			pprop->type = (StructRNA *)type;
 			break;
 		}
 		case PROP_COLLECTION: {
-			CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
-			cprop->item_type = (StructRNA*)type;
+			CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
+			cprop->item_type = (StructRNA *)type;
 			break;
 		}
 		default:
@@ -1256,7 +1257,7 @@ void RNA_def_property_struct_runtime(PropertyRNA *prop, StructRNA *type)
 
 	switch (prop->type) {
 		case PROP_POINTER: {
-			PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
+			PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
 			pprop->type = type;
 
 			if (type && (type->flag & STRUCT_ID_REFCOUNT))
@@ -1265,7 +1266,7 @@ void RNA_def_property_struct_runtime(PropertyRNA *prop, StructRNA *type)
 			break;
 		}
 		case PROP_COLLECTION: {
-			CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
+			CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
 			cprop->item_type = type;
 			break;
 		}
@@ -1284,8 +1285,8 @@ void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem *item
 
 	switch (prop->type) {
 		case PROP_ENUM: {
-			EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
-			eprop->item = (EnumPropertyItem*)item;
+			EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
+			eprop->item = (EnumPropertyItem *)item;
 			eprop->totitem = 0;
 			for (i = 0; item[i].identifier; i++) {
 				eprop->totitem++;
@@ -1319,7 +1320,7 @@ void RNA_def_property_string_maxlength(PropertyRNA *prop, int maxlength)
 
 	switch (prop->type) {
 		case PROP_STRING: {
-			StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+			StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 			sprop->maxlength = maxlength;
 			break;
 		}
@@ -1336,7 +1337,7 @@ void RNA_def_property_boolean_default(PropertyRNA *prop, int value)
 
 	switch (prop->type) {
 		case PROP_BOOLEAN: {
-			BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+			BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 			bprop->defaultvalue = value;
 			break;
 		}
@@ -1353,7 +1354,7 @@ void RNA_def_property_boolean_array_default(PropertyRNA *prop, const int *array)
 
 	switch (prop->type) {
 		case PROP_BOOLEAN: {
-			BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+			BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 			bprop->defaultarray = array;
 			break;
 		}
@@ -1370,7 +1371,7 @@ void RNA_def_property_int_default(PropertyRNA *prop, int value)
 
 	switch (prop->type) {
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 			iprop->defaultvalue = value;
 			break;
 		}
@@ -1387,7 +1388,7 @@ void RNA_def_property_int_array_default(PropertyRNA *prop, const int *array)
 
 	switch (prop->type) {
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 			iprop->defaultarray = array;
 			break;
 		}
@@ -1404,7 +1405,7 @@ void RNA_def_property_float_default(PropertyRNA *prop, float value)
 
 	switch (prop->type) {
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 			fprop->defaultvalue = value;
 			break;
 		}
@@ -1421,7 +1422,7 @@ void RNA_def_property_float_array_default(PropertyRNA *prop, const float *array)
 
 	switch (prop->type) {
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 			fprop->defaultarray = array; /* WARNING, this array must not come from the stack and lost */
 			break;
 		}
@@ -1438,7 +1439,7 @@ void RNA_def_property_string_default(PropertyRNA *prop, const char *value)
 
 	switch (prop->type) {
 		case PROP_STRING: {
-			StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+			StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 			sprop->defaultvalue = value;
 			break;
 		}
@@ -1456,13 +1457,13 @@ void RNA_def_property_enum_default(PropertyRNA *prop, int value)
 
 	switch (prop->type) {
 		case PROP_ENUM: {
-			EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+			EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 			eprop->defaultvalue = value;
 
 			if (prop->flag & PROP_ENUM_FLAG) {
 				/* check all bits are accounted for */
 				int totflag = 0;
-				for (i = 0; i<eprop->totitem; i++) {
+				for (i = 0; i < eprop->totitem; i++) {
 					if (eprop->item[i].identifier[0]) {
 						totflag |= eprop->item[i].value;
 					}
@@ -1475,7 +1476,7 @@ void RNA_def_property_enum_default(PropertyRNA *prop, int value)
 				}
 			}
 			else {
-				for (i = 0; i<eprop->totitem; i++) {
+				for (i = 0; i < eprop->totitem; i++) {
 					if (eprop->item[i].identifier[0] && eprop->item[i].value == eprop->defaultvalue)
 						defaultfound = 1;
 				}
@@ -1512,7 +1513,7 @@ static PropertyDefRNA *rna_def_property_sdna(PropertyRNA *prop, const char *stru
 	dp = rna_find_struct_property_def(DefRNA.laststruct, prop);
 	if (dp == NULL) return NULL;
 
-	ds = rna_find_struct_def((StructRNA*)dp->cont);
+	ds = rna_find_struct_def((StructRNA *)dp->cont);
 
 	if (!structname)
 		structname = ds->dnaname;
@@ -1610,7 +1611,7 @@ void RNA_def_property_boolean_negative_sdna(PropertyRNA *prop, const char *struc
 void RNA_def_property_int_sdna(PropertyRNA *prop, const char *structname, const char *propname)
 {
 	PropertyDefRNA *dp;
-	IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+	IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 	StructRNA *srna = DefRNA.laststruct;
 	
 	if (!DefRNA.preprocess) {
@@ -1661,7 +1662,7 @@ void RNA_def_property_int_sdna(PropertyRNA *prop, const char *structname, const
 void RNA_def_property_float_sdna(PropertyRNA *prop, const char *structname, const char *propname)
 {
 	PropertyDefRNA *dp;
-	FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+	FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 	StructRNA *srna = DefRNA.laststruct;
 
 	if (!DefRNA.preprocess) {
@@ -1714,7 +1715,7 @@ void RNA_def_property_enum_sdna(PropertyRNA *prop, const char *structname, const
 		return;
 	}
 
-	if (( /* dp= */ rna_def_property_sdna(prop, structname, propname))) {
+	if ((/* dp= */ rna_def_property_sdna(prop, structname, propname))) {
 		if (prop->arraydimension) {
 			prop->arraydimension = 0;
 			prop->totarraylength = 0;
@@ -1743,7 +1744,7 @@ void RNA_def_property_enum_bitflag_sdna(PropertyRNA *prop, const char *structnam
 void RNA_def_property_string_sdna(PropertyRNA *prop, const char *structname, const char *propname)
 {
 	/* PropertyDefRNA *dp; */
-	StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+	StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 	StructRNA *srna = DefRNA.laststruct;
 
 	if (!DefRNA.preprocess) {
@@ -1800,7 +1801,7 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
                                       const char *lengthpropname)
 {
 	PropertyDefRNA *dp;
-	CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
+	CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
 	StructRNA *srna = DefRNA.laststruct;
 
 	if (!DefRNA.preprocess) {
@@ -1835,7 +1836,7 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
 
 	if (dp && lengthpropname) {
 		DNAStructMember smember;
-		StructDefRNA *ds = rna_find_struct_def((StructRNA*)dp->cont);
+		StructDefRNA *ds = rna_find_struct_def((StructRNA *)dp->cont);
 
 		if (!structname)
 			structname = ds->dnaname;
@@ -1939,7 +1940,7 @@ void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const ch
 
 	switch (prop->type) {
 		case PROP_BOOLEAN: {
-			BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+			BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 
 			if (prop->arraydimension) {
 				if (get) bprop->getarray = (PropBooleanArrayGetFunc)get;
@@ -1969,7 +1970,7 @@ void RNA_def_property_int_funcs(PropertyRNA *prop, const char *get, const char *
 
 	switch (prop->type) {
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 
 			if (prop->arraydimension) {
 				if (get) iprop->getarray = (PropIntArrayGetFunc)get;
@@ -2000,7 +2001,7 @@ void RNA_def_property_float_funcs(PropertyRNA *prop, const char *get, const char
 
 	switch (prop->type) {
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 
 			if (prop->arraydimension) {
 				if (get) fprop->getarray = (PropFloatArrayGetFunc)get;
@@ -2031,7 +2032,7 @@ void RNA_def_property_enum_funcs(PropertyRNA *prop, const char *get, const char
 
 	switch (prop->type) {
 		case PROP_ENUM: {
-			EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+			EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 
 			if (get) eprop->get = (PropEnumGetFunc)get;
 			if (set) eprop->set = (PropEnumSetFunc)set;
@@ -2056,7 +2057,7 @@ void RNA_def_property_string_funcs(PropertyRNA *prop, const char *get, const cha
 
 	switch (prop->type) {
 		case PROP_STRING: {
-			StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+			StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 
 			if (get) sprop->get = (PropStringGetFunc)get;
 			if (length) sprop->length = (PropStringLengthFunc)length;
@@ -2082,7 +2083,7 @@ void RNA_def_property_pointer_funcs(PropertyRNA *prop, const char *get, const ch
 
 	switch (prop->type) {
 		case PROP_POINTER: {
-			PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
+			PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
 
 			if (get) pprop->get = (PropPointerGetFunc)get;
 			if (set) pprop->set = (PropPointerSetFunc)set;
@@ -2110,7 +2111,7 @@ void RNA_def_property_collection_funcs(PropertyRNA *prop, const char *begin, con
 
 	switch (prop->type) {
 		case PROP_COLLECTION: {
-			CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
+			CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
 
 			if (begin) cprop->begin = (PropCollectionBeginFunc)begin;
 			if (next) cprop->next = (PropCollectionNextFunc)next;
@@ -2131,7 +2132,7 @@ void RNA_def_property_collection_funcs(PropertyRNA *prop, const char *begin, con
 
 void RNA_def_property_srna(PropertyRNA *prop, const char *type)
 {
-	prop->srna = (StructRNA*)type;
+	prop->srna = (StructRNA *)type;
 }
 
 void RNA_def_py_data(PropertyRNA *prop, void *py_data)
@@ -2371,13 +2372,13 @@ PropertyRNA *RNA_def_enum_flag(StructOrFunctionRNA *cont_, const char *identifie
 
 void RNA_def_enum_funcs(PropertyRNA *prop, EnumPropertyItemFunc itemfunc)
 {
-	EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+	EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 	eprop->itemf = itemfunc;
 }
 
 void RNA_def_enum_py_data(PropertyRNA *prop, void *py_data)
 {
-	EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+	EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 	eprop->py_data = py_data;
 }
 
@@ -2707,9 +2708,9 @@ int rna_parameter_size(PropertyRNA *parm)
 		switch (ptype) {
 			case PROP_BOOLEAN:
 			case PROP_INT:
-				return sizeof(int)*len;
+				return sizeof(int) * len;
 			case PROP_FLOAT:
-				return sizeof(float)*len;
+				return sizeof(float) * len;
 			default:
 				break;
 		}
@@ -2725,7 +2726,7 @@ int rna_parameter_size(PropertyRNA *parm)
 			case PROP_STRING:
 				/* return values don't store a pointer to the original */
 				if (parm->flag & PROP_THICK_WRAP) {
-					StringPropertyRNA *sparm = (StringPropertyRNA*)parm;
+					StringPropertyRNA *sparm = (StringPropertyRNA *)parm;
 					return sizeof(char) * sparm->maxlength;
 				}
 				else
@@ -2771,18 +2772,18 @@ void RNA_enum_item_add(EnumPropertyItem **items, int *totitem, const EnumPropert
 	int tot = *totitem;
 
 	if (tot == 0) {
-		*items = MEM_callocN(sizeof(EnumPropertyItem)*8, "RNA_enum_items_add");
+		*items = MEM_callocN(sizeof(EnumPropertyItem) * 8, "RNA_enum_items_add");
 	}
-	else if (tot >= 8 && (tot&(tot-1)) == 0) {
+	else if (tot >= 8 && (tot & (tot - 1)) == 0) {
 		/* power of two > 8 */
-		newitems = MEM_callocN(sizeof(EnumPropertyItem)*tot*2, "RNA_enum_items_add");
-		memcpy(newitems, *items, sizeof(EnumPropertyItem)*tot);
+		newitems = MEM_callocN(sizeof(EnumPropertyItem) * tot * 2, "RNA_enum_items_add");
+		memcpy(newitems, *items, sizeof(EnumPropertyItem) * tot);
 		MEM_freeN(*items);
 		*items = newitems;
 	}
 
 	(*items)[tot] = *item;
-	*totitem = tot+1;
+	*totitem = tot + 1;
 }
 
 void RNA_enum_item_add_separator(EnumPropertyItem **items, int *totitem)
@@ -2830,9 +2831,9 @@ void RNA_def_struct_duplicate_pointers(StructRNA *srna)
 void RNA_def_struct_free_pointers(StructRNA *srna)
 {
 	if (srna->flag & STRUCT_FREE_POINTERS) {
-		if (srna->identifier) MEM_freeN((void*)srna->identifier);
-		if (srna->name) MEM_freeN((void*)srna->name);
-		if (srna->description) MEM_freeN((void*)srna->description);
+		if (srna->identifier) MEM_freeN((void *)srna->identifier);
+		if (srna->name) MEM_freeN((void *)srna->name);
+		if (srna->description) MEM_freeN((void *)srna->description);
 	}
 }
 
@@ -2847,8 +2848,8 @@ void RNA_def_func_duplicate_pointers(FunctionRNA *func)
 void RNA_def_func_free_pointers(FunctionRNA *func)
 {
 	if (func->flag & FUNC_FREE_POINTERS) {
-		if (func->identifier) MEM_freeN((void*)func->identifier);
-		if (func->description) MEM_freeN((void*)func->description);
+		if (func->identifier) MEM_freeN((void *)func->identifier);
+		if (func->description) MEM_freeN((void *)func->description);
 	}
 }
 
@@ -2864,9 +2865,9 @@ void RNA_def_property_duplicate_pointers(StructOrFunctionRNA *cont_, PropertyRNA
 	 * in the first place */
 	if (prop->identifier) {
 		if (cont->prophash) {
-			BLI_ghash_remove(cont->prophash, (void*)prop->identifier, NULL, NULL);
+			BLI_ghash_remove(cont->prophash, (void *)prop->identifier, NULL, NULL);
 			prop->identifier = BLI_strdup(prop->identifier);
-			BLI_ghash_insert(cont->prophash, (void*)prop->identifier, prop);
+			BLI_ghash_insert(cont->prophash, (void *)prop->identifier, prop);
 		}
 		else {
 			prop->identifier = BLI_strdup(prop->identifier);
@@ -2878,34 +2879,34 @@ void RNA_def_property_duplicate_pointers(StructOrFunctionRNA *cont_, PropertyRNA
 
 	switch (prop->type) {
 		case PROP_BOOLEAN: {
-			BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+			BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 
 			if (bprop->defaultarray) {
-				iarray = MEM_callocN(sizeof(int)*prop->totarraylength, "RNA_def_property_store");
-				memcpy(iarray, bprop->defaultarray, sizeof(int)*prop->totarraylength);
+				iarray = MEM_callocN(sizeof(int) * prop->totarraylength, "RNA_def_property_store");
+				memcpy(iarray, bprop->defaultarray, sizeof(int) * prop->totarraylength);
 				bprop->defaultarray = iarray;
 			}
 			break;
 		}
 		case PROP_INT: {
-			IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+			IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 
 			if (iprop->defaultarray) {
-				iarray = MEM_callocN(sizeof(int)*prop->totarraylength, "RNA_def_property_store");
-				memcpy(iarray, iprop->defaultarray, sizeof(int)*prop->totarraylength);
+				iarray = MEM_callocN(sizeof(int) * prop->totarraylength, "RNA_def_property_store");
+				memcpy(iarray, iprop->defaultarray, sizeof(int) * prop->totarraylength);
 				iprop->defaultarray = iarray;
 			}
 			break;
 		}
 		case PROP_ENUM: {
-			EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+			EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 
 			if (eprop->item) {
-				earray = MEM_callocN(sizeof(EnumPropertyItem)*(eprop->totitem+1), "RNA_def_property_store"),
-				memcpy(earray, eprop->item, sizeof(EnumPropertyItem)*(eprop->totitem+1));
+				earray = MEM_callocN(sizeof(EnumPropertyItem) * (eprop->totitem + 1), "RNA_def_property_store"),
+				memcpy(earray, eprop->item, sizeof(EnumPropertyItem) * (eprop->totitem + 1));
 				eprop->item = earray;
 
-				for (a = 0; a<eprop->totitem; a++) {
+				for (a = 0; a < eprop->totitem; a++) {
 					if (eprop->item[a].identifier)
 						eprop->item[a].identifier = BLI_strdup(eprop->item[a].identifier);
 					if (eprop->item[a].name)
@@ -2917,17 +2918,17 @@ void RNA_def_property_duplicate_pointers(StructOrFunctionRNA *cont_, PropertyRNA
 			break;
 		}
 		case PROP_FLOAT: {
-			FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+			FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 
 			if (fprop->defaultarray) {
-				farray = MEM_callocN(sizeof(float)*prop->totarraylength, "RNA_def_property_store");
-				memcpy(farray, fprop->defaultarray, sizeof(float)*prop->totarraylength);
+				farray = MEM_callocN(sizeof(float) * prop->totarraylength, "RNA_def_property_store");
+				memcpy(farray, fprop->defaultarray, sizeof(float) * prop->totarraylength);
 				fprop->defaultarray = farray;
 			}
 			break;
 		}
 		case PROP_STRING: {
-			StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+			StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 			if (sprop->defaultvalue)
 				sprop->defaultvalue = BLI_strdup(sprop->defaultvalue);
 			break;
@@ -2945,52 +2946,52 @@ void RNA_def_property_free_pointers(PropertyRNA *prop)
 		int a;
 
 		if (prop->identifier)
-			MEM_freeN((void*)prop->identifier);
+			MEM_freeN((void *)prop->identifier);
 		if (prop->name)
-			MEM_freeN((void*)prop->name);
+			MEM_freeN((void *)prop->name);
 		if (prop->description)
-			MEM_freeN((void*)prop->description);
+			MEM_freeN((void *)prop->description);
 		if (prop->py_data)
 			MEM_freeN(prop->py_data);
 
 		switch (prop->type) {
 			case PROP_BOOLEAN: {
-				BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+				BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 				if (bprop->defaultarray)
-					MEM_freeN((void*)bprop->defaultarray);
+					MEM_freeN((void *)bprop->defaultarray);
 				break;
 			}
 			case PROP_INT: {
-				IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+				IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 				if (iprop->defaultarray)
-					MEM_freeN((void*)iprop->defaultarray);
+					MEM_freeN((void *)iprop->defaultarray);
 				break;
 			}
 			case PROP_FLOAT: {
-				FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+				FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 				if (fprop->defaultarray)
-					MEM_freeN((void*)fprop->defaultarray);
+					MEM_freeN((void *)fprop->defaultarray);
 				break;
 			}
 			case PROP_ENUM: {
-				EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+				EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 
-				for (a = 0; a<eprop->totitem; a++) {
+				for (a = 0; a < eprop->totitem; a++) {
 					if (eprop->item[a].identifier)
-						MEM_freeN((void*)eprop->item[a].identifier);
+						MEM_freeN((void *)eprop->item[a].identifier);
 					if (eprop->item[a].name)
-						MEM_freeN((void*)eprop->item[a].name);
+						MEM_freeN((void *)eprop->item[a].name);
 					if (eprop->item[a].description)
-						MEM_freeN((void*)eprop->item[a].description);
+						MEM_freeN((void *)eprop->item[a].description);
 				}
 
-				if (eprop->item) MEM_freeN((void*)eprop->item);
+				if (eprop->item) MEM_freeN((void *)eprop->item);
 				break;
 			}
 			case PROP_STRING: {
-				StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+				StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 				if (sprop->defaultvalue)
-					MEM_freeN((void*)sprop->defaultvalue);
+					MEM_freeN((void *)sprop->defaultvalue);
 				break;
 			}
 			default:
@@ -3005,7 +3006,7 @@ static void rna_def_property_free(StructOrFunctionRNA *cont_, PropertyRNA *prop)
 	
 	if (prop->flag & PROP_RUNTIME) {
 		if (cont->prophash)
-			BLI_ghash_remove(cont->prophash, (void*)prop->identifier, NULL, NULL);
+			BLI_ghash_remove(cont->prophash, (void *)prop->identifier, NULL, NULL);
 
 		RNA_def_property_free_pointers(prop);
 		rna_freelinkN(&cont->properties, prop);