Code cleanup in rna files (huge, higly automated with py script).

Addresses:
* C++ comments.
* Spaces after if/for/while/switch statements.
* Spaces around assignment operators.

1 files changed, 120 insertions, 120 deletions

diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 7e3922a8f81..ebd77219dc0 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -42,7 +42,7 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
-static EnumPropertyItem image_source_items[]= {
+static EnumPropertyItem image_source_items[] = {
 	{IMA_SRC_FILE, "FILE", 0, "Single Image", "Single image file"},
 	{IMA_SRC_SEQUENCE, "SEQUENCE", 0, "Image Sequence", "Multiple image files, as a sequence"},
 	{IMA_SRC_MOVIE, "MOVIE", 0, "Movie", "Movie file"},
@@ -56,24 +56,24 @@ static EnumPropertyItem image_source_items[]= {
 
 static void rna_Image_animated_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= (Image*)ptr->data;
+	Image *ima = (Image*)ptr->data;
 	int  nr;
 
-	if(ima->flag & IMA_TWINANIM) {
-		nr= ima->xrep*ima->yrep;
-		if(ima->twsta>=nr) ima->twsta= 1;
-		if(ima->twend>=nr) ima->twend= nr-1;
-		if(ima->twsta>ima->twend) ima->twsta= 1;
+	if (ima->flag & IMA_TWINANIM) {
+		nr = ima->xrep*ima->yrep;
+		if (ima->twsta >= nr) ima->twsta = 1;
+		if (ima->twend >= nr) ima->twend = nr-1;
+		if (ima->twsta>ima->twend) ima->twsta = 1;
 	}
 }
 
 static int rna_Image_dirty_get(PointerRNA *ptr)
 {
-	Image *ima= (Image*)ptr->data;
+	Image *ima = (Image*)ptr->data;
 	ImBuf *ibuf;
 
-	for(ibuf=ima->ibufs.first; ibuf; ibuf=ibuf->next)
-		if(ibuf->userflags & IB_BITMAPDIRTY)
+	for (ibuf = ima->ibufs.first; ibuf; ibuf = ibuf->next)
+		if (ibuf->userflags & IB_BITMAPDIRTY)
 			return 1;
 	
 	return 0;
@@ -81,26 +81,26 @@ static int rna_Image_dirty_get(PointerRNA *ptr)
 
 static void rna_Image_source_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_SRC_CHANGE);
 	DAG_id_tag_update(&ima->id, 0);
 }
 
 static void rna_Image_fields_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	ImBuf *ibuf;
 	void *lock;
 
-	ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
+	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 
-	if(ibuf) {
-		short nr= 0;
+	if (ibuf) {
+		short nr = 0;
 
-		if(!(ima->flag & IMA_FIELDS) && (ibuf->flags & IB_fields)) nr= 1;
-		if((ima->flag & IMA_FIELDS) && !(ibuf->flags & IB_fields)) nr= 1;
+		if (!(ima->flag & IMA_FIELDS) && (ibuf->flags & IB_fields)) nr = 1;
+		if ((ima->flag & IMA_FIELDS) && !(ibuf->flags & IB_fields)) nr = 1;
 
-		if(nr)
+		if (nr)
 			BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 	}
 
@@ -109,7 +109,7 @@ static void rna_Image_fields_update(Main *UNUSED(bmain), Scene *UNUSED(scene), P
 
 static void rna_Image_free_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 	WM_main_add_notifier(NC_IMAGE|NA_EDITED, &ima->id);
 	DAG_id_tag_update(&ima->id, 0);
@@ -118,7 +118,7 @@ static void rna_Image_free_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi
 
 static void rna_Image_reload_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
 	WM_main_add_notifier(NC_IMAGE|NA_EDITED, &ima->id);
 	DAG_id_tag_update(&ima->id, 0);
@@ -126,13 +126,13 @@ static void rna_Image_reload_update(Main *UNUSED(bmain), Scene *UNUSED(scene), P
 
 static void rna_Image_generated_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 }
 
 static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 {
-	ImageUser *iuser= ptr->data;
+	ImageUser *iuser = ptr->data;
 
 	BKE_image_user_calc_frame(iuser, scene->r.cfra, 0);
 }
@@ -141,9 +141,9 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *
 char *rna_ImageUser_path(PointerRNA *ptr)
 {
 	if (ptr->id.data) {
-		// ImageUser *iuser= ptr->data;
+		/* ImageUser *iuser= ptr->data; */
 		
-		switch(GS(((ID *)ptr->id.data)->name)) {
+		switch (GS(((ID *)ptr->id.data)->name)) {
 		case ID_TE:
 			return BLI_strdup("image_user");
 		}
@@ -154,11 +154,11 @@ char *rna_ImageUser_path(PointerRNA *ptr)
 
 static EnumPropertyItem *rna_Image_source_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
 {
-	Image *ima= (Image*)ptr->data;
-	EnumPropertyItem *item= NULL;
-	int totitem= 0;
+	Image *ima = (Image*)ptr->data;
+	EnumPropertyItem *item = NULL;
+	int totitem = 0;
 	
-	if(ima->source == IMA_SRC_VIEWER) {
+	if (ima->source == IMA_SRC_VIEWER) {
 		RNA_enum_items_add_value(&item, &totitem, image_source_items, IMA_SRC_VIEWER);
 	}
 	else {
@@ -169,24 +169,24 @@ static EnumPropertyItem *rna_Image_source_itemf(bContext *UNUSED(C), PointerRNA
 	}
 
 	RNA_enum_item_end(&item, &totitem);
-	*free= 1;
+	*free = 1;
 
 	return item;
 }
 
 static int rna_Image_file_format_get(PointerRNA *ptr)
 {
-	Image *image= (Image*)ptr->data;
-	ImBuf *ibuf= BKE_image_get_ibuf(image, NULL);
+	Image *image = (Image*)ptr->data;
+	ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
 	return BKE_ftype_to_imtype(ibuf ? ibuf->ftype : 0);
 }
 
 static void rna_Image_file_format_set(PointerRNA *ptr, int value)
 {
-	Image *image= (Image*)ptr->data;
-	if(BKE_imtype_is_movie(value) == 0) { /* should be able to throw an error here */
+	Image *image = (Image*)ptr->data;
+	if (BKE_imtype_is_movie(value) == 0) { /* should be able to throw an error here */
 		ImBuf *ibuf;
-		int ftype= BKE_imtype_to_ftype(value);
+		int ftype = BKE_imtype_to_ftype(value);
 
 		/*
 		ibuf= BKE_image_get_ibuf(image, NULL);
@@ -195,15 +195,15 @@ static void rna_Image_file_format_set(PointerRNA *ptr, int value)
 		*/
 
 		/* to be safe change all buffer file types */
-		for(ibuf= image->ibufs.first; ibuf; ibuf= ibuf->next) {
-			ibuf->ftype= ftype;
+		for (ibuf = image->ibufs.first; ibuf; ibuf = ibuf->next) {
+			ibuf->ftype = ftype;
 		}
 	}
 }
 
 static int rna_Image_has_data_get(PointerRNA *ptr)
 {
-	Image *im= (Image*)ptr->data;
+	Image *im = (Image*)ptr->data;
 
 	if (im->ibufs.first)
 		return 1;
@@ -213,18 +213,18 @@ static int rna_Image_has_data_get(PointerRNA *ptr)
 
 static void rna_Image_size_get(PointerRNA *ptr,int *values)
 {
-	Image *im= (Image*)ptr->data;
+	Image *im = (Image*)ptr->data;
 	ImBuf *ibuf;
 	void *lock;
 
 	ibuf = BKE_image_acquire_ibuf(im, NULL , &lock);
 	if (ibuf) {
-		values[0]= ibuf->x;
-		values[1]= ibuf->y;
+		values[0] = ibuf->x;
+		values[1] = ibuf->y;
 	}
 	else {
-		values[0]= 0;
-		values[1]= 0;
+		values[0] = 0;
+		values[1] = 0;
 	}
 
 	BKE_image_release_ibuf(im, lock);
@@ -232,18 +232,18 @@ static void rna_Image_size_get(PointerRNA *ptr,int *values)
 
 static void rna_Image_resolution_get(PointerRNA *ptr, float *values)
 {
-	Image *im= (Image*)ptr->data;
+	Image *im = (Image*)ptr->data;
 	ImBuf *ibuf;
 	void *lock;
 
 	ibuf = BKE_image_acquire_ibuf(im, NULL , &lock);
 	if (ibuf) {
-		values[0]= ibuf->ppm[0];
-		values[1]= ibuf->ppm[1];
+		values[0] = ibuf->ppm[0];
+		values[1] = ibuf->ppm[1];
 	}
 	else {
-		values[0]= 0;
-		values[1]= 0;
+		values[0] = 0;
+		values[1] = 0;
 	}
 
 	BKE_image_release_ibuf(im, lock);
@@ -251,14 +251,14 @@ static void rna_Image_resolution_get(PointerRNA *ptr, float *values)
 
 static void rna_Image_resolution_set(PointerRNA *ptr, const float *values)
 {
-	Image *im= (Image*)ptr->data;
+	Image *im = (Image*)ptr->data;
 	ImBuf *ibuf;
 	void *lock;
 
 	ibuf = BKE_image_acquire_ibuf(im, NULL , &lock);
 	if (ibuf) {
-		ibuf->ppm[0]= values[0];
-		ibuf->ppm[1]= values[1];
+		ibuf->ppm[0] = values[0];
+		ibuf->ppm[1] = values[1];
 	}
 
 	BKE_image_release_ibuf(im, lock);
@@ -266,19 +266,19 @@ static void rna_Image_resolution_set(PointerRNA *ptr, const float *values)
 
 static int rna_Image_depth_get(PointerRNA *ptr)
 {
-	Image *im= (Image*)ptr->data;
+	Image *im = (Image*)ptr->data;
 	ImBuf *ibuf;
 	void *lock;
 	int planes;
 	
-	ibuf= BKE_image_acquire_ibuf(im, NULL, &lock);
+	ibuf = BKE_image_acquire_ibuf(im, NULL, &lock);
 
-	if(!ibuf)
-		planes= 0;
-	else if(ibuf->rect_float)
-		planes= ibuf->planes * 4;
+	if (!ibuf)
+		planes = 0;
+	else if (ibuf->rect_float)
+		planes = ibuf->planes * 4;
 	else
-		planes= ibuf->planes;
+		planes = ibuf->planes;
 
 	BKE_image_release_ibuf(im, lock);
 
@@ -287,16 +287,16 @@ static int rna_Image_depth_get(PointerRNA *ptr)
 
 static int rna_Image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	ImBuf *ibuf;
 	void *lock;
 
-	ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
+	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 
-	if(ibuf)
-		length[0]= ibuf->x*ibuf->y*ibuf->channels;
+	if (ibuf)
+		length[0] = ibuf->x*ibuf->y*ibuf->channels;
 	else
-		length[0]= 0;
+		length[0] = 0;
 
 	BKE_image_release_ibuf(ima, lock);
 
@@ -305,21 +305,21 @@ static int rna_Image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY
 
 static void rna_Image_pixels_get(PointerRNA *ptr, float *values)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	ImBuf *ibuf;
 	void *lock;
 	int i, size;
 
-	ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
+	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 
-	if(ibuf) {
-		size= ibuf->x*ibuf->y*ibuf->channels;
+	if (ibuf) {
+		size = ibuf->x*ibuf->y*ibuf->channels;
 
-		if(ibuf->rect_float) {
+		if (ibuf->rect_float) {
 			memcpy(values, ibuf->rect_float, sizeof(float)*size);
 		}
 		else {
-			for(i = 0; i < size; i++)
+			for (i = 0; i < size; i++)
 				values[i] = ((unsigned char*)ibuf->rect)[i]*(1.0f/255.0f);
 		}
 	}
@@ -329,21 +329,21 @@ static void rna_Image_pixels_get(PointerRNA *ptr, float *values)
 
 static void rna_Image_pixels_set(PointerRNA *ptr, const float *values)
 {
-	Image *ima= ptr->id.data;
+	Image *ima = ptr->id.data;
 	ImBuf *ibuf;
 	void *lock;
 	int i, size;
 
-	ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
+	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 
-	if(ibuf) {
-		size= ibuf->x*ibuf->y*ibuf->channels;
+	if (ibuf) {
+		size = ibuf->x*ibuf->y*ibuf->channels;
 
-		if(ibuf->rect_float) {
+		if (ibuf->rect_float) {
 			memcpy(ibuf->rect_float, values, sizeof(float)*size);
 		}
 		else {
-			for(i = 0; i < size; i++)
+			for (i = 0; i < size; i++)
 				((unsigned char*)ibuf->rect)[i] = FTOCHAR(values[i]);
 		}
 
@@ -360,51 +360,51 @@ static void rna_def_imageuser(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna= RNA_def_struct(brna, "ImageUser", NULL);
+	srna = RNA_def_struct(brna, "ImageUser", NULL);
 	RNA_def_struct_ui_text(srna, "Image User", "Parameters defining how an Image datablock is used by another datablock");
 	RNA_def_struct_path_func(srna, "rna_ImageUser_path");
 
-	prop= RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANIM_ALWAYS);
 	RNA_def_property_ui_text(prop, "Auto Refresh", "Always refresh image on frame changes");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
 	/* animation */
-	prop= RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "cycl", 0);
 	RNA_def_property_ui_text(prop, "Cyclic", "Cycle the images in the movie");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
-	prop= RNA_def_property(srna, "frame_duration", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "frame_duration", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "frames");
 	RNA_def_property_range(prop, 0, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Frames", "Number of images of a movie to use");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
-	prop= RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "offset");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Offset", "Offset the number of the frame to use in the animation");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
-	prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
+	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "sfra");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Start Frame", "Global starting frame of the movie/sequence, assuming first picture has a #1");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
-	prop= RNA_def_property(srna, "fields_per_frame", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "fields_per_frame", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "fie_ima");
 	RNA_def_property_range(prop, 1, 200);
 	RNA_def_property_ui_text(prop, "Fields per Frame", "Number of fields per rendered frame (2 fields is 1 image)");
 	RNA_def_property_update(prop, 0, "rna_ImageUser_update");
 
-	prop= RNA_def_property(srna, "multilayer_layer", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "multilayer_layer", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "layer");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* image_multi_cb */
 	RNA_def_property_ui_text(prop, "Layer", "Layer in multilayer image");
 
-	prop= RNA_def_property(srna, "multilayer_pass", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "multilayer_pass", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "pass");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* image_multi_cb */
 	RNA_def_property_ui_text(prop, "Pass", "Pass in multilayer image");
@@ -414,178 +414,178 @@ static void rna_def_image(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-	static const EnumPropertyItem prop_type_items[]= {
+	static const EnumPropertyItem prop_type_items[] = {
 		{IMA_TYPE_IMAGE, "IMAGE", 0, "Image", ""},
 		{IMA_TYPE_MULTILAYER, "MULTILAYER", 0, "Multilayer", ""},
 		{IMA_TYPE_UV_TEST, "UV_TEST", 0, "UV Test", ""},
 		{IMA_TYPE_R_RESULT, "RENDER_RESULT", 0, "Render Result", ""},
 		{IMA_TYPE_COMPOSITE, "COMPOSITING", 0, "Compositing", ""},
 		{0, NULL, 0, NULL, NULL}};
-	static const EnumPropertyItem prop_generated_type_items[]= {
+	static const EnumPropertyItem prop_generated_type_items[] = {
 		{0, "BLANK", 0, "Blank", "Generate a blank image"},
 		{1, "UV_GRID", 0, "UV Grid", "Generated grid to test UV mappings"},
 		{2, "COLOR_GRID", 0, "Color Grid", "Generated improved UV grid to test UV mappings"},
 		{0, NULL, 0, NULL, NULL}};
-	static const EnumPropertyItem prop_mapping_items[]= {
+	static const EnumPropertyItem prop_mapping_items[] = {
 		{0, "UV", 0, "UV Coordinates", "Use UV coordinates for mapping the image"},
 		{IMA_REFLECT, "REFLECTION", 0, "Reflection", "Use reflection mapping for mapping the image"},
 		{0, NULL, 0, NULL, NULL}};
-	static const EnumPropertyItem prop_field_order_items[]= {
+	static const EnumPropertyItem prop_field_order_items[] = {
 		{0, "EVEN", 0, "Upper First", "Upper field first"},
 		{IMA_STD_FIELD, "ODD", 0, "Lower First", "Lower field first"},
 		{0, NULL, 0, NULL, NULL}};
 
-	srna= RNA_def_struct(brna, "Image", "ID");
+	srna = RNA_def_struct(brna, "Image", "ID");
 	RNA_def_struct_ui_text(srna, "Image", "Image datablock referencing an external or packed image");
 	RNA_def_struct_ui_icon(srna, ICON_IMAGE_DATA);
 
-	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
+	prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "File Name", "Image/Movie file name");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_reload_update");
 
 	/* eek. this is horrible but needed so we can save to a new name without blanking the data :( */
-	prop= RNA_def_property(srna, "filepath_raw", PROP_STRING, PROP_FILEPATH);
+	prop = RNA_def_property(srna, "filepath_raw", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "File Name", "Image/Movie file name (without data refreshing)");
 
-	prop= RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, image_type_items);
 	RNA_def_property_enum_funcs(prop, "rna_Image_file_format_get", "rna_Image_file_format_set", NULL);
 	RNA_def_property_ui_text(prop, "File Format", "Format used for re-saving this file");
 
-	prop= RNA_def_property(srna, "source", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "source", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, image_source_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Image_source_itemf");
 	RNA_def_property_ui_text(prop, "Source", "Where the image comes from");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_source_update");
 
-	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Type", "How to generate the image");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
 	RNA_def_property_ui_text(prop, "Packed File", "");
 	
-	prop= RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
 	RNA_def_property_enum_items(prop, prop_field_order_items);
 	RNA_def_property_ui_text(prop, "Field Order", "Order of video fields (select which lines are displayed first)");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 	
 	/* booleans */
-	prop= RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_FIELDS);
 	RNA_def_property_ui_text(prop, "Fields", "Use fields of the image");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_fields_update");
 
-	prop= RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_DO_PREMUL);
 	RNA_def_property_ui_text(prop, "Premultiply", "Convert RGB from key alpha to premultiplied alpha");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_free_update");
 	
-	prop= RNA_def_property(srna, "use_color_unpremultiply", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_color_unpremultiply", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_CM_PREDIVIDE);
 	RNA_def_property_ui_text(prop, "Color Unpremultiply", "For premultiplied alpha images, do color space conversion on colors without alpha, to avoid fringing for images with light backgrounds");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_free_update");
 
-	prop= RNA_def_property(srna, "is_dirty", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "is_dirty", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_Image_dirty_get", NULL);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Dirty", "Image has changed and is not saved");
 
 	/* generated image (image_generated_change_cb) */
-	prop= RNA_def_property(srna, "generated_type", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "generated_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "gen_type");
 	RNA_def_property_enum_items(prop, prop_generated_type_items);
 	RNA_def_property_ui_text(prop, "Generated Type", "Generated image type");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
 
-	prop= RNA_def_property(srna, "generated_width", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "generated_width", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gen_x");
 	RNA_def_property_range(prop, 1, 16384);
 	RNA_def_property_ui_text(prop, "Generated Width", "Generated image width");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
 
-	prop= RNA_def_property(srna, "generated_height", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "generated_height", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gen_y");
 	RNA_def_property_range(prop, 1, 16384);
 	RNA_def_property_ui_text(prop, "Generated Height", "Generated image height");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
 
-	prop= RNA_def_property(srna, "use_generated_float", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_generated_float", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gen_flag", IMA_GEN_FLOAT);
 	RNA_def_property_ui_text(prop, "Float Buffer", "Generate floating point buffer");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
 
 	/* realtime properties */
-	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, "flag");
 	RNA_def_property_enum_items(prop, prop_mapping_items);
 	RNA_def_property_ui_text(prop, "Mapping", "Mapping type to use for this image in the game engine");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_XYZ);
+	prop = RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_float_sdna(prop, NULL, "aspx");
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_range(prop, 0.1f, 5000.0f);
 	RNA_def_property_ui_text(prop, "Display Aspect", "Display Aspect for this image, does not affect rendering");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "use_animation", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_animation", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_TWINANIM);
 	RNA_def_property_ui_text(prop, "Animated", "Use as animated texture in the game engine");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update");
 
-	prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "twsta");
 	RNA_def_property_range(prop, 0, 128);
 	RNA_def_property_ui_text(prop, "Animation Start", "Start frame of an animated texture");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update");
 
-	prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "twend");
 	RNA_def_property_range(prop, 0, 128);
 	RNA_def_property_ui_text(prop, "Animation End", "End frame of an animated texture");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update");
 
-	prop= RNA_def_property(srna, "fps", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "fps", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "animspeed");
 	RNA_def_property_range(prop, 1, 100);
 	RNA_def_property_ui_text(prop, "Animation Speed", "Speed of the animation in frames per second");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "use_tiles", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_tiles", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_TILES);
 	RNA_def_property_ui_text(prop, "Tiles", "Use of tilemode for faces (default shift-LMB to pick the tile for selected faces)");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "tiles_x", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "tiles_x", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "xrep");
 	RNA_def_property_range(prop, 1, 16);
 	RNA_def_property_ui_text(prop, "Tiles X", "Degree of repetition in the X direction");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "tiles_y", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "tiles_y", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "yrep");
 	RNA_def_property_range(prop, 1, 16);
 	RNA_def_property_ui_text(prop, "Tiles Y", "Degree of repetition in the Y direction");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "use_clamp_x", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_clamp_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_CLAMP_U);
 	RNA_def_property_ui_text(prop, "Clamp X", "Disable texture repeating horizontally");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "use_clamp_y", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_clamp_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_CLAMP_V);
 	RNA_def_property_ui_text(prop, "Clamp Y", "Disable texture repeating vertically");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
 
-	prop= RNA_def_property(srna, "bindcode", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "bindcode", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "bindcode");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Bindcode", "OpenGL bindcode");
@@ -595,24 +595,24 @@ static void rna_def_image(BlenderRNA *brna)
 	   Image.has_data and Image.depth are temporary,
 	   Update import_obj.py when they are replaced (Arystan)
 	*/
-	prop= RNA_def_property(srna, "has_data", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "has_data", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_Image_has_data_get", NULL);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Has data", "True if this image has data");
 
-	prop= RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED);
+	prop = RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_funcs(prop, "rna_Image_depth_get", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Depth", "Image bit depth");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
-	prop= RNA_def_int_vector(srna, "size" , 2 , NULL , 0, 0, "Size" , "Width and height in pixels, zero when image data cant be loaded" , 0 , 0);
+	prop = RNA_def_int_vector(srna, "size" , 2 , NULL , 0, 0, "Size" , "Width and height in pixels, zero when image data cant be loaded" , 0 , 0);
 	RNA_def_property_int_funcs(prop, "rna_Image_size_get" , NULL, NULL);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
-	prop= RNA_def_float_vector(srna, "resolution" , 2 , NULL , 0, 0, "Resolution" , "X/Y pixels per meter" , 0 , 0);
+	prop = RNA_def_float_vector(srna, "resolution" , 2 , NULL , 0, 0, "Resolution" , "X/Y pixels per meter" , 0 , 0);
 	RNA_def_property_float_funcs(prop, "rna_Image_resolution_get" , "rna_Image_resolution_set", NULL);
 
-	prop= RNA_def_property(srna, "pixels", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "pixels", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_flag(prop, PROP_DYNAMIC);
 	RNA_def_property_multi_array(prop, 1, NULL);
 	RNA_def_property_ui_text(prop, "Pixels", "Image pixels in floating point values");