style cleanup: BKE_*.c files which deal with library functions

1 files changed, 625 insertions, 626 deletions

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 88cfa63e3e7..aff1e65224b 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -92,18 +92,18 @@
 #include "BLO_sys_types.h" // for intptr_t support
 
 /* max int, to indicate we don't store sequences in ibuf */
-#define IMA_NO_INDEX	0x7FEFEFEF
+#define IMA_NO_INDEX    0x7FEFEFEF
 
 /* quick lookup: supports 1 million frames, thousand passes */
-#define IMA_MAKE_INDEX(frame, index)	((frame)<<10)+index
-#define IMA_INDEX_FRAME(index)			(index>>10)
-#define IMA_INDEX_PASS(index)			(index & ~1023)
+#define IMA_MAKE_INDEX(frame, index)    ((frame) << 10) + index
+#define IMA_INDEX_FRAME(index)          (index >> 10)
+#define IMA_INDEX_PASS(index)           (index & ~1023)
 
 /* ******** IMAGE PROCESSING ************* */
 
-static void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
+static void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
 {
-	struct ImBuf * tbuf1, * tbuf2;
+	struct ImBuf *tbuf1, *tbuf2;
 	
 	if (ibuf == NULL) return;
 	if (ibuf->flags & IB_fields) return;
@@ -129,9 +129,9 @@ static void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
 	ibuf->y /= 2;
 }
 
-static void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
+static void de_interlace_st(struct ImBuf *ibuf) /* standard fields */
 {
-	struct ImBuf * tbuf1, * tbuf2;
+	struct ImBuf *tbuf1, *tbuf2;
 	
 	if (ibuf == NULL) return;
 	if (ibuf->flags & IB_fields) return;
@@ -159,7 +159,7 @@ static void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
 
 void BKE_image_de_interlace(Image *ima, int odd)
 {
-	ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+	ImBuf *ibuf = BKE_image_get_ibuf(ima, NULL);
 	if (ibuf) {
 		if (odd)
 			de_interlace_st(ibuf);
@@ -185,16 +185,16 @@ static void image_free_buffers(Image *ima)
 	}
 	
 	if (ima->anim) IMB_free_anim(ima->anim);
-	ima->anim= NULL;
+	ima->anim = NULL;
 
 	if (ima->rr) {
 		RE_FreeRenderResult(ima->rr);
-		ima->rr= NULL;
+		ima->rr = NULL;
 	}	
 	
 	GPU_free_image(ima);
 	
-	ima->ok= IMA_OK;
+	ima->ok = IMA_OK;
 }
 
 /* called by library too, do not free ima itself */
@@ -212,10 +212,10 @@ void BKE_image_free(Image *ima)
 
 	BKE_previewimg_free(&ima->preview);
 
-	for (a=0; a<IMA_MAX_RENDER_SLOT; a++) {
+	for (a = 0; a < IMA_MAX_RENDER_SLOT; a++) {
 		if (ima->renders[a]) {
 			RE_FreeRenderResult(ima->renders[a]);
-			ima->renders[a]= NULL;
+			ima->renders[a] = NULL;
 		}
 	}
 }
@@ -225,17 +225,17 @@ static Image *image_alloc(const char *name, short source, short type)
 {
 	Image *ima;
 	
-	ima= BKE_libblock_alloc(&G.main->image, ID_IM, name);
+	ima = BKE_libblock_alloc(&G.main->image, ID_IM, name);
 	if (ima) {
-		ima->ok= IMA_OK;
+		ima->ok = IMA_OK;
 		
-		ima->xrep= ima->yrep= 1;
-		ima->aspx= ima->aspy= 1.0;
-		ima->gen_x= 1024; ima->gen_y= 1024;
-		ima->gen_type= 1;	/* no defines yet? */
+		ima->xrep = ima->yrep = 1;
+		ima->aspx = ima->aspy = 1.0;
+		ima->gen_x = 1024; ima->gen_y = 1024;
+		ima->gen_type = 1;   /* no defines yet? */
 		
-		ima->source= source;
-		ima->type= type;
+		ima->source = source;
+		ima->type = type;
 	}
 	return ima;
 }
@@ -246,14 +246,14 @@ static ImBuf *image_get_ibuf(Image *ima, int index, int frame)
 	/* this function is intended to be thread safe. with IMA_NO_INDEX this
 	 * should be OK, but when iterating over the list this is more tricky
 	 * */
-	if (index==IMA_NO_INDEX)
+	if (index == IMA_NO_INDEX)
 		return ima->ibufs.first;
 	else {
 		ImBuf *ibuf;
 
-		index= IMA_MAKE_INDEX(frame, index);
-		for (ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next)
-			if (ibuf->index==index)
+		index = IMA_MAKE_INDEX(frame, index);
+		for (ibuf = ima->ibufs.first; ibuf; ibuf = ibuf->next)
+			if (ibuf->index == index)
 				return ibuf;
 
 		return NULL;
@@ -276,15 +276,15 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
 	if (ibuf) {
 		ImBuf *link;
 		
-		if (index!=IMA_NO_INDEX)
-			index= IMA_MAKE_INDEX(frame, index);
+		if (index != IMA_NO_INDEX)
+			index = IMA_MAKE_INDEX(frame, index);
 		
 		/* insert based on index */
-		for (link= ima->ibufs.first; link; link= link->next)
-			if (link->index>=index)
+		for (link = ima->ibufs.first; link; link = link->next)
+			if (link->index >= index)
 				break;
 
-		ibuf->index= index;
+		ibuf->index = index;
 		if (ima->flag & IMA_CM_PREDIVIDE)
 			ibuf->flags |= IB_cm_predivide;
 		else
@@ -294,7 +294,7 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
 		BLI_insertlinkbefore(&ima->ibufs, link, ibuf);
 
 		/* now we don't want copies? */
-		if (link && ibuf->index==link->index)
+		if (link && ibuf->index == link->index)
 			image_remove_ibuf(ima, link);
 	}
 }
@@ -302,21 +302,21 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
 /* empty image block, of similar type and filename */
 Image *BKE_image_copy(Image *ima)
 {
-	Image *nima= image_alloc(ima->id.name+2, ima->source, ima->type);
+	Image *nima = image_alloc(ima->id.name + 2, ima->source, ima->type);
 
 	BLI_strncpy(nima->name, ima->name, sizeof(ima->name));
 
-	nima->flag= ima->flag;
-	nima->tpageflag= ima->tpageflag;
+	nima->flag = ima->flag;
+	nima->tpageflag = ima->tpageflag;
 	
-	nima->gen_x= ima->gen_x;
-	nima->gen_y= ima->gen_y;
-	nima->gen_type= ima->gen_type;
+	nima->gen_x = ima->gen_x;
+	nima->gen_y = ima->gen_y;
+	nima->gen_type = ima->gen_type;
 
-	nima->animspeed= ima->animspeed;
+	nima->animspeed = ima->animspeed;
 
-	nima->aspx= ima->aspx;
-	nima->aspy= ima->aspy;
+	nima->aspx = ima->aspx;
+	nima->aspy = ima->aspy;
 
 	return nima;
 }
@@ -329,54 +329,54 @@ static void extern_local_image(Image *UNUSED(ima))
 
 void BKE_image_make_local(struct Image *ima)
 {
-	Main *bmain= G.main;
+	Main *bmain = G.main;
 	Tex *tex;
 	Brush *brush;
 	Mesh *me;
-	int is_local= FALSE, is_lib= FALSE;
+	int is_local = FALSE, is_lib = FALSE;
 
 	/* - only lib users: do nothing
 	 * - only local users: set flag
 	 * - mixed: make copy
 	 */
 
-	if (ima->id.lib==NULL) return;
+	if (ima->id.lib == NULL) return;
 
 	/* Can't take short cut here: must check meshes at least because of bogus
 	 * texface ID refs. - z0r */
 #if 0
-	if (ima->id.us==1) {
+	if (ima->id.us == 1) {
 		id_clear_lib_data(bmain, &ima->id);
 		extern_local_image(ima);
 		return;
 	}
 #endif
 
-	for (tex= bmain->tex.first; tex; tex= tex->id.next) {
+	for (tex = bmain->tex.first; tex; tex = tex->id.next) {
 		if (tex->ima == ima) {
-			if (tex->id.lib) is_lib= TRUE;
-			else is_local= TRUE;
+			if (tex->id.lib) is_lib = TRUE;
+			else is_local = TRUE;
 		}
 	}
-	for (brush= bmain->brush.first; brush; brush= brush->id.next) {
+	for (brush = bmain->brush.first; brush; brush = brush->id.next) {
 		if (brush->clone.image == ima) {
-			if (brush->id.lib) is_lib= TRUE;
-			else is_local= TRUE;
+			if (brush->id.lib) is_lib = TRUE;
+			else is_local = TRUE;
 		}
 	}
-	for (me= bmain->mesh.first; me; me= me->id.next) {
+	for (me = bmain->mesh.first; me; me = me->id.next) {
 		if (me->mtface) {
 			MTFace *tface;
 			int a, i;
 
-			for (i=0; i<me->fdata.totlayer; i++) {
+			for (i = 0; i < me->fdata.totlayer; i++) {
 				if (me->fdata.layers[i].type == CD_MTFACE) {
-					tface= (MTFace*)me->fdata.layers[i].data;
+					tface = (MTFace *)me->fdata.layers[i].data;
 
-					for (a=0; a<me->totface; a++, tface++) {
+					for (a = 0; a < me->totface; a++, tface++) {
 						if (tface->tpage == ima) {
-							if (me->id.lib) is_lib= TRUE;
-							else is_local= TRUE;
+							if (me->id.lib) is_lib = TRUE;
+							else is_local = TRUE;
 						}
 					}
 				}
@@ -387,14 +387,14 @@ void BKE_image_make_local(struct Image *ima)
 			MTexPoly *mtpoly;
 			int a, i;
 
-			for (i=0; i<me->pdata.totlayer; i++) {
+			for (i = 0; i < me->pdata.totlayer; i++) {
 				if (me->pdata.layers[i].type == CD_MTEXPOLY) {
-					mtpoly= (MTexPoly*)me->pdata.layers[i].data;
+					mtpoly = (MTexPoly *)me->pdata.layers[i].data;
 
-					for (a=0; a<me->totpoly; a++, mtpoly++) {
+					for (a = 0; a < me->totpoly; a++, mtpoly++) {
 						if (mtpoly->tpage == ima) {
-							if (me->id.lib) is_lib= TRUE;
-							else is_local= TRUE;
+							if (me->id.lib) is_lib = TRUE;
+							else is_local = TRUE;
 						}
 					}
 				}
@@ -408,55 +408,55 @@ void BKE_image_make_local(struct Image *ima)
 		extern_local_image(ima);
 	}
 	else if (is_local && is_lib) {
-		Image *ima_new= BKE_image_copy(ima);
+		Image *ima_new = BKE_image_copy(ima);
 
-		ima_new->id.us= 0;
+		ima_new->id.us = 0;
 
 		/* Remap paths of new ID using old library as base. */
 		BKE_id_lib_local_paths(bmain, ima->id.lib, &ima_new->id);
 
-		tex= bmain->tex.first;
+		tex = bmain->tex.first;
 		while (tex) {
-			if (tex->id.lib==NULL) {
-				if (tex->ima==ima) {
+			if (tex->id.lib == NULL) {
+				if (tex->ima == ima) {
 					tex->ima = ima_new;
 					ima_new->id.us++;
 					ima->id.us--;
 				}
 			}
-			tex= tex->id.next;
+			tex = tex->id.next;
 		}
-		brush= bmain->brush.first;
+		brush = bmain->brush.first;
 		while (brush) {
-			if (brush->id.lib==NULL) {
-				if (brush->clone.image==ima) {
+			if (brush->id.lib == NULL) {
+				if (brush->clone.image == ima) {
 					brush->clone.image = ima_new;
 					ima_new->id.us++;
 					ima->id.us--;
 				}
 			}
-			brush= brush->id.next;
+			brush = brush->id.next;
 		}
 		/* Transfer references in texfaces. Texfaces don't add to image ID
 		 * user count *unless* there are no other users. See
 		 * readfile.c:lib_link_mtface. */
-		me= bmain->mesh.first;
+		me = bmain->mesh.first;
 		while (me) {
 			if (me->mtface) {
 				MTFace *tface;
 				int a, i;
 
-				for (i=0; i<me->fdata.totlayer; i++) {
+				for (i = 0; i < me->fdata.totlayer; i++) {
 					if (me->fdata.layers[i].type == CD_MTFACE) {
-						tface= (MTFace*)me->fdata.layers[i].data;
+						tface = (MTFace *)me->fdata.layers[i].data;
 
-						for (a=0; a<me->totface; a++, tface++) {	
+						for (a = 0; a < me->totface; a++, tface++) {
 							if (tface->tpage == ima) {
 								tface->tpage = ima_new;
 								if (ima_new->id.us == 0) {
-									tface->tpage->id.us= 1;
+									tface->tpage->id.us = 1;
 								}
-								id_lib_extern((ID*)ima_new);
+								id_lib_extern((ID *)ima_new);
 							}
 						}
 					}
@@ -467,24 +467,24 @@ void BKE_image_make_local(struct Image *ima)
 				MTexPoly *mtpoly;
 				int a, i;
 
-				for (i=0; i<me->pdata.totlayer; i++) {
+				for (i = 0; i < me->pdata.totlayer; i++) {
 					if (me->pdata.layers[i].type == CD_MTEXPOLY) {
-						mtpoly= (MTexPoly*)me->pdata.layers[i].data;
+						mtpoly = (MTexPoly *)me->pdata.layers[i].data;
 
-						for (a=0; a<me->totpoly; a++, mtpoly++) {
+						for (a = 0; a < me->totpoly; a++, mtpoly++) {
 							if (mtpoly->tpage == ima) {
 								mtpoly->tpage = ima_new;
 								if (ima_new->id.us == 0) {
-									mtpoly->tpage->id.us= 1;
+									mtpoly->tpage->id.us = 1;
 								}
-								id_lib_extern((ID*)ima_new);
+								id_lib_extern((ID *)ima_new);
 							}
 						}
 					}
 				}
 			}
 
-			me= me->id.next;
+			me = me->id.next;
 		}
 	}
 }
@@ -494,9 +494,9 @@ void BKE_image_merge(Image *dest, Image *source)
 	ImBuf *ibuf;
 	
 	/* sanity check */
-	if (dest && source && dest!=source) {
+	if (dest && source && dest != source) {
 	
-		while ((ibuf= source->ibufs.first)) {
+		while ((ibuf = source->ibufs.first)) {
 			BLI_remlink(&source->ibufs, ibuf);
 			image_assign_ibuf(dest, ibuf, IMA_INDEX_PASS(ibuf->index), IMA_INDEX_FRAME(ibuf->index));
 		}
@@ -516,21 +516,21 @@ Image *BKE_image_load(const char *filepath)
 	BLI_path_abs(str, G.main->name);
 
 	/* exists? */
-	file= BLI_open(str, O_BINARY|O_RDONLY, 0);
-	if (file== -1) return NULL;
+	file = BLI_open(str, O_BINARY | O_RDONLY, 0);
+	if (file == -1) return NULL;
 	close(file);
 
 	/* create a short library name */
-	len= strlen(filepath);
+	len = strlen(filepath);
 
 	while (len > 0 && filepath[len - 1] != '/' && filepath[len - 1] != '\\') len--;
-	libname= filepath+len;
+	libname = filepath + len;
 
-	ima= image_alloc(libname, IMA_SRC_FILE, IMA_TYPE_IMAGE);
+	ima = image_alloc(libname, IMA_SRC_FILE, IMA_TYPE_IMAGE);
 	BLI_strncpy(ima->name, filepath, sizeof(ima->name));
 
 	if (BLI_testextensie_array(filepath, imb_ext_movie))
-		ima->source= IMA_SRC_MOVIE;
+		ima->source = IMA_SRC_MOVIE;
 
 	return ima;
 }
@@ -548,17 +548,17 @@ Image *BKE_image_load_exists(const char *filepath)
 	BLI_path_abs(str, G.main->name);
 
 	/* first search an identical image */
-	for (ima= G.main->image.first; ima; ima= ima->id.next) {
-		if (ima->source!=IMA_SRC_VIEWER && ima->source!=IMA_SRC_GENERATED) {
+	for (ima = G.main->image.first; ima; ima = ima->id.next) {
+		if (ima->source != IMA_SRC_VIEWER && ima->source != IMA_SRC_GENERATED) {
 			BLI_strncpy(strtest, ima->name, sizeof(ima->name));
 			BLI_path_abs(strtest, G.main->name);
 			
-			if (BLI_path_cmp(strtest, str)==0) {
-				if (ima->anim==NULL || ima->id.us==0) {
-					BLI_strncpy(ima->name, filepath, sizeof(ima->name));	/* for stringcode */
-					ima->id.us++;										/* officially should not, it doesn't link here! */
-					if (ima->ok==0)
-						ima->ok= IMA_OK;
+			if (BLI_path_cmp(strtest, str) == 0) {
+				if (ima->anim == NULL || ima->id.us == 0) {
+					BLI_strncpy(ima->name, filepath, sizeof(ima->name));    /* for stringcode */
+					ima->id.us++;                                       /* officially should not, it doesn't link here! */
+					if (ima->ok == 0)
+						ima->ok = IMA_OK;
 					/* RETURN! */
 					return ima;
 				}
@@ -572,30 +572,30 @@ Image *BKE_image_load_exists(const char *filepath)
 static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
 {
 	ImBuf *ibuf;
-	unsigned char *rect= NULL;
-	float *rect_float= NULL;
+	unsigned char *rect = NULL;
+	float *rect_float = NULL;
 	
 	if (floatbuf) {
-		ibuf= IMB_allocImBuf(width, height, depth, IB_rectfloat);
-		rect_float= (float*)ibuf->rect_float;
+		ibuf = IMB_allocImBuf(width, height, depth, IB_rectfloat);
+		rect_float = (float *)ibuf->rect_float;
 	}
 	else {
-		ibuf= IMB_allocImBuf(width, height, depth, IB_rect);
-		rect= (unsigned char*)ibuf->rect;
+		ibuf = IMB_allocImBuf(width, height, depth, IB_rect);
+		rect = (unsigned char *)ibuf->rect;
 	}
 	
 	BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
 	ibuf->userflags |= IB_BITMAPDIRTY;
 	
 	switch (uvtestgrid) {
-	case 1:
-		BKE_image_buf_fill_checker(rect, rect_float, width, height);
-		break;
-	case 2:
-		BKE_image_buf_fill_checker_color(rect, rect_float, width, height);
-		break;
-	default:
-		BKE_image_buf_fill_color(rect, rect_float, width, height, color);
+		case 1:
+			BKE_image_buf_fill_checker(rect, rect_float, width, height);
+			break;
+		case 2:
+			BKE_image_buf_fill_checker_color(rect, rect_float, width, height);
+			break;
+		default:
+			BKE_image_buf_fill_color(rect, rect_float, width, height, color);
 	}
 
 	return ibuf;
@@ -605,21 +605,21 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char
 Image *BKE_image_add_generated(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
 {
 	/* on save, type is changed to FILE in editsima.c */
-	Image *ima= image_alloc(name, IMA_SRC_GENERATED, IMA_TYPE_UV_TEST);
+	Image *ima = image_alloc(name, IMA_SRC_GENERATED, IMA_TYPE_UV_TEST);
 	
 	if (ima) {
 		ImBuf *ibuf;
 		
 		/* BLI_strncpy(ima->name, name, FILE_MAX); */ /* don't do this, this writes in ain invalid filepath! */
-		ima->gen_x= width;
-		ima->gen_y= height;
-		ima->gen_type= uvtestgrid;
+		ima->gen_x = width;
+		ima->gen_y = height;
+		ima->gen_type = uvtestgrid;
 		ima->gen_flag |= (floatbuf ? IMA_GEN_FLOAT : 0);
 		
-		ibuf= add_ibuf_size(width, height, ima->name, depth, floatbuf, uvtestgrid, color);
+		ibuf = add_ibuf_size(width, height, ima->name, depth, floatbuf, uvtestgrid, color);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 		
-		ima->ok= IMA_OK_LOADED;
+		ima->ok = IMA_OK_LOADED;
 	}
 
 	return ima;
@@ -631,12 +631,12 @@ Image *BKE_image_add_from_imbuf(ImBuf *ibuf)
 	/* on save, type is changed to FILE in editsima.c */
 	Image *ima;
 
-	ima= image_alloc(BLI_path_basename(ibuf->name), IMA_SRC_FILE, IMA_TYPE_IMAGE);
+	ima = image_alloc(BLI_path_basename(ibuf->name), IMA_SRC_FILE, IMA_TYPE_IMAGE);
 
 	if (ima) {
 		BLI_strncpy(ima->name, ibuf->name, FILE_MAX);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
-		ima->ok= IMA_OK_LOADED;
+		ima->ok = IMA_OK_LOADED;
 	}
 
 	return ima;
@@ -645,20 +645,20 @@ Image *BKE_image_add_from_imbuf(ImBuf *ibuf)
 /* packs rect from memory as PNG */
 void BKE_image_memorypack(Image *ima)
 {
-	ImBuf *ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
+	ImBuf *ibuf = image_get_ibuf(ima, IMA_NO_INDEX, 0);
 	
-	if (ibuf==NULL)
+	if (ibuf == NULL)
 		return;
 	if (ima->packedfile) {
 		freePackedFile(ima->packedfile);
 		ima->packedfile = NULL;
 	}
 	
-	ibuf->ftype= PNG;
-	ibuf->planes= R_IMF_PLANES_RGBA;
+	ibuf->ftype = PNG;
+	ibuf->planes = R_IMF_PLANES_RGBA;
 	
 	IMB_saveiff(ibuf, ibuf->name, IB_rect | IB_mem);
-	if (ibuf->encodedbuffer==NULL) {
+	if (ibuf->encodedbuffer == NULL) {
 		printf("memory save for pack error\n");
 	}
 	else {
@@ -666,14 +666,14 @@ void BKE_image_memorypack(Image *ima)
 		
 		pf->data = ibuf->encodedbuffer;
 		pf->size = ibuf->encodedsize;
-		ima->packedfile= pf;
-		ibuf->encodedbuffer= NULL;
-		ibuf->encodedsize= 0;
+		ima->packedfile = pf;
+		ibuf->encodedbuffer = NULL;
+		ibuf->encodedsize = 0;
 		ibuf->userflags &= ~IB_BITMAPDIRTY;
 		
-		if (ima->source==IMA_SRC_GENERATED) {
-			ima->source= IMA_SRC_FILE;
-			ima->type= IMA_TYPE_IMAGE;
+		if (ima->source == IMA_SRC_GENERATED) {
+			ima->source = IMA_SRC_FILE;
+			ima->type = IMA_TYPE_IMAGE;
 		}
 	}
 }
@@ -690,7 +690,7 @@ static void tag_all_images_time()
 	Image *ima;
 	int ctime = (int)PIL_check_seconds_timer();
 
-	ima= G.main->image.first;
+	ima = G.main->image.first;
 	while (ima) {
 		if (ima->bindcode || ima->repbind || ima->ibufs.first) {
 			ima->lastused = ctime;
@@ -718,9 +718,9 @@ void free_old_images(void)
 	
 	lasttime = ctime;
 
-	ima= G.main->image.first;
+	ima = G.main->image.first;
 	while (ima) {
-		if ((ima->flag & IMA_NOCOLLECT)==0 && ctime - ima->lastused > U.textimeout) {
+		if ((ima->flag & IMA_NOCOLLECT) == 0 && ctime - ima->lastused > U.textimeout) {
 			/* If it's in GL memory, deallocate and set time tag to current time
 			 * This gives textures a "second chance" to be used before dying. */
 			if (ima->bindcode || ima->repbind) {
@@ -742,18 +742,18 @@ static uintptr_t image_mem_size(Image *ima)
 	int level;
 	uintptr_t size = 0;
 
-	size= 0;
+	size = 0;
 	
 	/* viewers have memory depending on other rules, has no valid rect pointer */
-	if (ima->source==IMA_SRC_VIEWER)
+	if (ima->source == IMA_SRC_VIEWER)
 		return 0;
 	
-	for (ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) {
+	for (ibuf = ima->ibufs.first; ibuf; ibuf = ibuf->next) {
 		if (ibuf->rect) size += MEM_allocN_len(ibuf->rect);
 		else if (ibuf->rect_float) size += MEM_allocN_len(ibuf->rect_float);
 
-		for (level=0; level<IB_MIPMAP_LEVELS; level++) {
-			ibufm= ibuf->mipmap[level];
+		for (level = 0; level < IB_MIPMAP_LEVELS; level++) {
+			ibufm = ibuf->mipmap[level];
 			if (ibufm) {
 				if (ibufm->rect) size += MEM_allocN_len(ibufm->rect);
 				else if (ibufm->rect_float) size += MEM_allocN_len(ibufm->rect_float);
@@ -767,18 +767,18 @@ static uintptr_t image_mem_size(Image *ima)
 void BKE_image_print_memlist(void)
 {
 	Image *ima;
-	uintptr_t size, totsize= 0;
+	uintptr_t size, totsize = 0;
 
-	for (ima= G.main->image.first; ima; ima= ima->id.next)
+	for (ima = G.main->image.first; ima; ima = ima->id.next)
 		totsize += image_mem_size(ima);
 
-	printf("\ntotal image memory len: %.3f MB\n", (double)totsize/(double)(1024*1024));
+	printf("\ntotal image memory len: %.3f MB\n", (double)totsize / (double)(1024 * 1024));
 
-	for (ima= G.main->image.first; ima; ima= ima->id.next) {
-		size= image_mem_size(ima);
+	for (ima = G.main->image.first; ima; ima = ima->id.next) {
+		size = image_mem_size(ima);
 
 		if (size)
-			printf("%s len: %.3f MB\n", ima->id.name+2, (double)size/(double)(1024*1024));
+			printf("%s len: %.3f MB\n", ima->id.name + 2, (double)size / (double)(1024 * 1024));
 	}
 }
 
@@ -788,30 +788,30 @@ void BKE_image_free_all_textures(void)
 	Image *ima;
 	/* unsigned int totsize= 0; */
 	
-	for (ima= G.main->image.first; ima; ima= ima->id.next)
+	for (ima = G.main->image.first; ima; ima = ima->id.next)
 		ima->id.flag &= ~LIB_DOIT;
 	
-	for (tex= G.main->tex.first; tex; tex= tex->id.next)
+	for (tex = G.main->tex.first; tex; tex = tex->id.next)
 		if (tex->ima)
 			tex->ima->id.flag |= LIB_DOIT;
 	
-	for (ima= G.main->image.first; ima; ima= ima->id.next) {
+	for (ima = G.main->image.first; ima; ima = ima->id.next) {
 		if (ima->ibufs.first && (ima->id.flag & LIB_DOIT)) {
 			ImBuf *ibuf;
 			
-			for (ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) {
+			for (ibuf = ima->ibufs.first; ibuf; ibuf = ibuf->next) {
 				/* escape when image is painted on */
 				if (ibuf->userflags & IB_BITMAPDIRTY)
 					break;
 				
 #if 0
 				if (ibuf->mipmap[0]) 
-					totsize+= 1.33*ibuf->x*ibuf->y*4;
+					totsize += 1.33 * ibuf->x * ibuf->y * 4;
 				else
-					totsize+= ibuf->x*ibuf->y*4;
+					totsize += ibuf->x * ibuf->y * 4;
 #endif
 			}
-			if (ibuf==NULL)
+			if (ibuf == NULL)
 				image_free_buffers(ima);
 		}
 	}
@@ -823,13 +823,13 @@ void BKE_image_free_anim_ibufs(Image *ima, int except_frame)
 {
 	ImBuf *ibuf, *nbuf;
 
-	for (ibuf= ima->ibufs.first; ibuf; ibuf= nbuf) {
-		nbuf= ibuf->next;
+	for (ibuf = ima->ibufs.first; ibuf; ibuf = nbuf) {
+		nbuf = ibuf->next;
 		if (ibuf->userflags & IB_BITMAPDIRTY)
 			continue;
-		if (ibuf->index==IMA_NO_INDEX)
+		if (ibuf->index == IMA_NO_INDEX)
 			continue;
-		if (except_frame!=IMA_INDEX_FRAME(ibuf->index)) {
+		if (except_frame != IMA_INDEX_FRAME(ibuf->index)) {
 			BLI_remlink(&ima->ibufs, ibuf);
 			
 			if (ibuf->userdata) {
@@ -845,7 +845,7 @@ void BKE_image_all_free_anim_ibufs(int cfra)
 {
 	Image *ima;
 	
-	for (ima= G.main->image.first; ima; ima= ima->id.next)
+	for (ima = G.main->image.first; ima; ima = ima->id.next)
 		if (ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
 			BKE_image_free_anim_ibufs(ima, cfra);
 }
@@ -855,47 +855,47 @@ void BKE_image_all_free_anim_ibufs(int cfra)
 
 int BKE_imtype_to_ftype(const char imtype)
 {
-	if (imtype==R_IMF_IMTYPE_TARGA)
+	if (imtype == R_IMF_IMTYPE_TARGA)
 		return TGA;
-	else if (imtype==R_IMF_IMTYPE_RAWTGA)
+	else if (imtype == R_IMF_IMTYPE_RAWTGA)
 		return RAWTGA;
-	else if (imtype== R_IMF_IMTYPE_IRIS) 
+	else if (imtype == R_IMF_IMTYPE_IRIS)
 		return IMAGIC;
 #ifdef WITH_HDR
-	else if (imtype==R_IMF_IMTYPE_RADHDR)
+	else if (imtype == R_IMF_IMTYPE_RADHDR)
 		return RADHDR;
 #endif
-	else if (imtype==R_IMF_IMTYPE_PNG)
+	else if (imtype == R_IMF_IMTYPE_PNG)
 		return PNG;
 #ifdef WITH_DDS
-	else if (imtype==R_IMF_IMTYPE_DDS)
+	else if (imtype == R_IMF_IMTYPE_DDS)
 		return DDS;
 #endif
-	else if (imtype==R_IMF_IMTYPE_BMP)
+	else if (imtype == R_IMF_IMTYPE_BMP)
 		return BMP;
 #ifdef WITH_TIFF
-	else if (imtype==R_IMF_IMTYPE_TIFF)
+	else if (imtype == R_IMF_IMTYPE_TIFF)
 		return TIF;
 #endif
-	else if (imtype==R_IMF_IMTYPE_OPENEXR || imtype==R_IMF_IMTYPE_MULTILAYER)
+	else if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER)
 		return OPENEXR;
 #ifdef WITH_CINEON
-	else if (imtype==R_IMF_IMTYPE_CINEON)
+	else if (imtype == R_IMF_IMTYPE_CINEON)
 		return CINEON;
-	else if (imtype==R_IMF_IMTYPE_DPX)
+	else if (imtype == R_IMF_IMTYPE_DPX)
 		return DPX;
 #endif
 #ifdef WITH_OPENJPEG
-	else if (imtype==R_IMF_IMTYPE_JP2)
+	else if (imtype == R_IMF_IMTYPE_JP2)
 		return JP2;
 #endif
 	else
-		return JPG|90;
+		return JPG | 90;
 }
 
 char BKE_ftype_to_imtype(const int ftype)
 {
-	if (ftype==0)
+	if (ftype == 0)
 		return R_IMF_IMTYPE_TARGA;
 	else if (ftype == IMAGIC) 
 		return R_IMF_IMTYPE_IRIS;
@@ -939,15 +939,15 @@ char BKE_ftype_to_imtype(const int ftype)
 int BKE_imtype_is_movie(const char imtype)
 {
 	switch (imtype) {
-	case R_IMF_IMTYPE_AVIRAW:
-	case R_IMF_IMTYPE_AVIJPEG:
-	case R_IMF_IMTYPE_AVICODEC:
-	case R_IMF_IMTYPE_QUICKTIME:
-	case R_IMF_IMTYPE_FFMPEG:
-	case R_IMF_IMTYPE_H264:
-	case R_IMF_IMTYPE_THEORA:
-	case R_IMF_IMTYPE_XVID:
-	case R_IMF_IMTYPE_FRAMESERVER:
+		case R_IMF_IMTYPE_AVIRAW:
+		case R_IMF_IMTYPE_AVIJPEG:
+		case R_IMF_IMTYPE_AVICODEC:
+		case R_IMF_IMTYPE_QUICKTIME:
+		case R_IMF_IMTYPE_FFMPEG:
+		case R_IMF_IMTYPE_H264:
+		case R_IMF_IMTYPE_THEORA:
+		case R_IMF_IMTYPE_XVID:
+		case R_IMF_IMTYPE_FRAMESERVER:
 			return 1;
 	}
 	return 0;
@@ -956,8 +956,8 @@ int BKE_imtype_is_movie(const char imtype)
 int BKE_imtype_supports_zbuf(const char imtype)
 {
 	switch (imtype) {
-	case R_IMF_IMTYPE_IRIZ:
-	case R_IMF_IMTYPE_OPENEXR: /* but not R_IMF_IMTYPE_MULTILAYER */
+		case R_IMF_IMTYPE_IRIZ:
+		case R_IMF_IMTYPE_OPENEXR: /* but not R_IMF_IMTYPE_MULTILAYER */
 			return 1;
 	}
 	return 0;
@@ -966,7 +966,7 @@ int BKE_imtype_supports_zbuf(const char imtype)
 int BKE_imtype_supports_compress(const char imtype)
 {
 	switch (imtype) {
-	case R_IMF_IMTYPE_PNG:
+		case R_IMF_IMTYPE_PNG:
 			return 1;
 	}
 	return 0;
@@ -975,9 +975,9 @@ int BKE_imtype_supports_compress(const char imtype)
 int BKE_imtype_supports_quality(const char imtype)
 {
 	switch (imtype) {
-	case R_IMF_IMTYPE_JPEG90:
-	case R_IMF_IMTYPE_JP2:
-	case R_IMF_IMTYPE_AVIJPEG:
+		case R_IMF_IMTYPE_JPEG90:
+		case R_IMF_IMTYPE_JP2:
+		case R_IMF_IMTYPE_AVIJPEG:
 			return 1;
 	}
 	return 0;
@@ -985,32 +985,32 @@ int BKE_imtype_supports_quality(const char imtype)
 
 char BKE_imtype_valid_channels(const char imtype)
 {
-	char chan_flag= IMA_CHAN_FLAG_RGB; /* assume all support rgb */
+	char chan_flag = IMA_CHAN_FLAG_RGB; /* assume all support rgb */
 
 	/* alpha */
 	switch (imtype) {
-	case R_IMF_IMTYPE_TARGA:
-	case R_IMF_IMTYPE_IRIS:
-	case R_IMF_IMTYPE_PNG:
-	/* case R_IMF_IMTYPE_BMP: */ /* read but not write */
-	case R_IMF_IMTYPE_RADHDR:
-	case R_IMF_IMTYPE_TIFF:
-	case R_IMF_IMTYPE_OPENEXR:
-	case R_IMF_IMTYPE_MULTILAYER:
-	case R_IMF_IMTYPE_DDS:
-	case R_IMF_IMTYPE_JP2:
-	case R_IMF_IMTYPE_QUICKTIME:
+		case R_IMF_IMTYPE_TARGA:
+		case R_IMF_IMTYPE_IRIS:
+		case R_IMF_IMTYPE_PNG:
+		/* case R_IMF_IMTYPE_BMP: */ /* read but not write */
+		case R_IMF_IMTYPE_RADHDR:
+		case R_IMF_IMTYPE_TIFF:
+		case R_IMF_IMTYPE_OPENEXR:
+		case R_IMF_IMTYPE_MULTILAYER:
+		case R_IMF_IMTYPE_DDS:
+		case R_IMF_IMTYPE_JP2:
+		case R_IMF_IMTYPE_QUICKTIME:
 			chan_flag |= IMA_CHAN_FLAG_ALPHA;
 	}
 
 	/* bw */
 	switch (imtype) {
-	case R_IMF_IMTYPE_PNG:
-	case R_IMF_IMTYPE_JPEG90:
-	case R_IMF_IMTYPE_TARGA:
-	case R_IMF_IMTYPE_RAWTGA:
-	case R_IMF_IMTYPE_TIFF:
-	case R_IMF_IMTYPE_IRIS:
+		case R_IMF_IMTYPE_PNG:
+		case R_IMF_IMTYPE_JPEG90:
+		case R_IMF_IMTYPE_TARGA:
+		case R_IMF_IMTYPE_RAWTGA:
+		case R_IMF_IMTYPE_TIFF:
+		case R_IMF_IMTYPE_IRIS:
 			chan_flag |= IMA_CHAN_FLAG_BW;
 	}
 
@@ -1020,23 +1020,23 @@ char BKE_imtype_valid_channels(const char imtype)
 char BKE_imtype_valid_depths(const char imtype)
 {
 	switch (imtype) {
-	case R_IMF_IMTYPE_RADHDR:
-		return R_IMF_CHAN_DEPTH_32;
-	case R_IMF_IMTYPE_TIFF:
-		return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_16;
-	case R_IMF_IMTYPE_OPENEXR:
-		return R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_32;
-	case R_IMF_IMTYPE_MULTILAYER:
-		return R_IMF_CHAN_DEPTH_32;
-	/* eeh, cineone does some strange 10bits per channel */
-	case R_IMF_IMTYPE_DPX:
-	case R_IMF_IMTYPE_CINEON:
-		return R_IMF_CHAN_DEPTH_12;
-	case R_IMF_IMTYPE_JP2:
-		return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16;
-	/* most formats are 8bit only */
-	default:
-		return R_IMF_CHAN_DEPTH_8;
+		case R_IMF_IMTYPE_RADHDR:
+			return R_IMF_CHAN_DEPTH_32;
+		case R_IMF_IMTYPE_TIFF:
+			return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_16;
+		case R_IMF_IMTYPE_OPENEXR:
+			return R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_32;
+		case R_IMF_IMTYPE_MULTILAYER:
+			return R_IMF_CHAN_DEPTH_32;
+		/* eeh, cineone does some strange 10bits per channel */
+		case R_IMF_IMTYPE_DPX:
+		case R_IMF_IMTYPE_CINEON:
+			return R_IMF_CHAN_DEPTH_12;
+		case R_IMF_IMTYPE_JP2:
+			return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16;
+		/* most formats are 8bit only */
+		default:
+			return R_IMF_CHAN_DEPTH_8;
 	}
 }
 
@@ -1083,78 +1083,78 @@ char BKE_imtype_from_arg(const char *imtype_arg)
 
 int BKE_add_image_extension(char *string, const char imtype)
 {
-	const char *extension= NULL;
+	const char *extension = NULL;
 	
-	if (imtype== R_IMF_IMTYPE_IRIS) {
+	if (imtype == R_IMF_IMTYPE_IRIS) {
 		if (!BLI_testextensie(string, ".rgb"))
-			extension= ".rgb";
+			extension = ".rgb";
 	}
-	else if (imtype==R_IMF_IMTYPE_IRIZ) {
+	else if (imtype == R_IMF_IMTYPE_IRIZ) {
 		if (!BLI_testextensie(string, ".rgb"))
-			extension= ".rgb";
+			extension = ".rgb";
 	}
 #ifdef WITH_HDR
-	else if (imtype==R_IMF_IMTYPE_RADHDR) {
+	else if (imtype == R_IMF_IMTYPE_RADHDR) {
 		if (!BLI_testextensie(string, ".hdr"))
-			extension= ".hdr";
+			extension = ".hdr";
 	}
 #endif
 	else if (ELEM5(imtype, R_IMF_IMTYPE_PNG, R_IMF_IMTYPE_FFMPEG, R_IMF_IMTYPE_H264, R_IMF_IMTYPE_THEORA, R_IMF_IMTYPE_XVID)) {
 		if (!BLI_testextensie(string, ".png"))
-			extension= ".png";
+			extension = ".png";
 	}
 #ifdef WITH_DDS
-	else if (imtype==R_IMF_IMTYPE_DDS) {
+	else if (imtype == R_IMF_IMTYPE_DDS) {
 		if (!BLI_testextensie(string, ".dds"))
-			extension= ".dds";
+			extension = ".dds";
 	}
 #endif
-	else if (imtype==R_IMF_IMTYPE_RAWTGA) {
+	else if (imtype == R_IMF_IMTYPE_RAWTGA) {
 		if (!BLI_testextensie(string, ".tga"))
-			extension= ".tga";
+			extension = ".tga";
 	}
-	else if (imtype==R_IMF_IMTYPE_BMP) {
+	else if (imtype == R_IMF_IMTYPE_BMP) {
 		if (!BLI_testextensie(string, ".bmp"))
-			extension= ".bmp";
+			extension = ".bmp";
 	}
 #ifdef WITH_TIFF
-	else if (imtype==R_IMF_IMTYPE_TIFF) {
+	else if (imtype == R_IMF_IMTYPE_TIFF) {
 		if (!BLI_testextensie(string, ".tif") &&
 		    !BLI_testextensie(string, ".tiff"))
 		{
-			extension= ".tif";
+			extension = ".tif";
 		}
 	}
 #endif
 #ifdef WITH_OPENEXR
 	else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
 		if (!BLI_testextensie(string, ".exr"))
-			extension= ".exr";
+			extension = ".exr";
 	}
 #endif
 #ifdef WITH_CINEON
-	else if (imtype==R_IMF_IMTYPE_CINEON) {
+	else if (imtype == R_IMF_IMTYPE_CINEON) {
 		if (!BLI_testextensie(string, ".cin"))
-			extension= ".cin";
+			extension = ".cin";
 	}
-	else if (imtype==R_IMF_IMTYPE_DPX) {
+	else if (imtype == R_IMF_IMTYPE_DPX) {
 		if (!BLI_testextensie(string, ".dpx"))
-			extension= ".dpx";
+			extension = ".dpx";
 	}
 #endif
-	else if (imtype==R_IMF_IMTYPE_TARGA) {
+	else if (imtype == R_IMF_IMTYPE_TARGA) {
 		if (!BLI_testextensie(string, ".tga"))
-			extension= ".tga";
+			extension = ".tga";
 	}
 #ifdef WITH_OPENJPEG
-	else if (imtype==R_IMF_IMTYPE_JP2) {
+	else if (imtype == R_IMF_IMTYPE_JP2) {
 		if (!BLI_testextensie(string, ".jp2"))
-			extension= ".jp2";
+			extension = ".jp2";
 	}
 #endif
 	else { //   R_IMF_IMTYPE_AVICODEC, R_IMF_IMTYPE_AVIRAW, R_IMF_IMTYPE_AVIJPEG, R_IMF_IMTYPE_JPEG90, R_IMF_IMTYPE_QUICKTIME etc
 		if (!(BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
-			extension= ".jpg";
+			extension = ".jpg";
 	}
 
 	if (extension) {
@@ -1186,17 +1186,17 @@ void BKE_imformat_defaults(ImageFormatData *im_format)
 
 /* could allow access externally - 512 is for long names, 64 is for id names */
 typedef struct StampData {
-	char 	file[512];
-	char 	note[512];
-	char 	date[512];
-	char 	marker[512];
-	char 	time[512];
-	char 	frame[512];
-	char 	camera[64];
-	char 	cameralens[64];
-	char 	scene[64];
-	char 	strip[64];
-	char 	rendertime[64];
+	char file[512];
+	char note[512];
+	char date[512];
+	char marker[512];
+	char time[512];
+	char frame[512];
+	char camera[64];
+	char cameralens[64];
+	char scene[64];
+	char strip[64];
+	char rendertime[64];
 } StampData;
 
 static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int do_prefix)
@@ -1206,7 +1206,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	time_t t;
 
 	if (scene->r.stamp & R_STAMP_FILENAME) {
-		BLI_snprintf(stamp_data->file, sizeof(stamp_data->file), do_prefix ? "File %s":"%s", G.relbase_valid ? G.main->name:"<untitled>");
+		BLI_snprintf(stamp_data->file, sizeof(stamp_data->file), do_prefix ? "File %s" : "%s", G.relbase_valid ? G.main->name : "<untitled>");
 	}
 	else {
 		stamp_data->file[0] = '\0';
@@ -1223,8 +1223,8 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	if (scene->r.stamp & R_STAMP_DATE) {
 		t = time(NULL);
 		tl = localtime(&t);
-		BLI_snprintf(text, sizeof(text), "%04d/%02d/%02d %02d:%02d:%02d", tl->tm_year+1900, tl->tm_mon+1, tl->tm_mday, tl->tm_hour, tl->tm_min, tl->tm_sec);
-		BLI_snprintf(stamp_data->date, sizeof(stamp_data->date), do_prefix ? "Date %s":"%s", text);
+		BLI_snprintf(text, sizeof(text), "%04d/%02d/%02d %02d:%02d:%02d", tl->tm_year + 1900, tl->tm_mon + 1, tl->tm_mday, tl->tm_hour, tl->tm_min, tl->tm_sec);
+		BLI_snprintf(stamp_data->date, sizeof(stamp_data->date), do_prefix ? "Date %s" : "%s", text);
 	}
 	else {
 		stamp_data->date[0] = '\0';
@@ -1233,10 +1233,10 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	if (scene->r.stamp & R_STAMP_MARKER) {
 		char *name = BKE_scene_find_last_marker_name(scene, CFRA);
 
-		if (name)	BLI_strncpy(text, name, sizeof(text));
-		else 		BLI_strncpy(text, "<none>", sizeof(text));
+		if (name) BLI_strncpy(text, name, sizeof(text));
+		else BLI_strncpy(text, "<none>", sizeof(text));
 
-		BLI_snprintf(stamp_data->marker, sizeof(stamp_data->marker), do_prefix ? "Marker %s":"%s", text);
+		BLI_snprintf(stamp_data->marker, sizeof(stamp_data->marker), do_prefix ? "Marker %s" : "%s", text);
 	}
 	else {
 		stamp_data->marker[0] = '\0';
@@ -1245,8 +1245,8 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	if (scene->r.stamp & R_STAMP_TIME) {
 		int f = (int)(scene->r.cfra % scene->r.frs_sec);
 		int s = (int)(scene->r.cfra / scene->r.frs_sec);
-		int h= 0;
-		int m= 0;
+		int h = 0;
+		int m = 0;
 
 		if (s) {
 			m = (int)(s / 60);
@@ -1263,7 +1263,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 		else
 			BLI_snprintf(text, sizeof(text), "%02d:%02d:%02d.%03d", h, m, s, f);
 
-		BLI_snprintf(stamp_data->time, sizeof(stamp_data->time), do_prefix ? "Time %s":"%s", text);
+		BLI_snprintf(stamp_data->time, sizeof(stamp_data->time), do_prefix ? "Time %s" : "%s", text);
 	}
 	else {
 		stamp_data->time[0] = '\0';
@@ -1271,20 +1271,20 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	
 	if (scene->r.stamp & R_STAMP_FRAME) {
 		char fmtstr[32];
-		int digits= 1;
+		int digits = 1;
 		
-		if (scene->r.efra>9)
-			digits= 1 + (int) log10(scene->r.efra);
+		if (scene->r.efra > 9)
+			digits = 1 + (int) log10(scene->r.efra);
 
-		BLI_snprintf(fmtstr, sizeof(fmtstr), do_prefix ? "Frame %%0%di":"%%0%di", digits);
-		BLI_snprintf (stamp_data->frame, sizeof(stamp_data->frame), fmtstr, scene->r.cfra);
+		BLI_snprintf(fmtstr, sizeof(fmtstr), do_prefix ? "Frame %%0%di" : "%%0%di", digits);
+		BLI_snprintf(stamp_data->frame, sizeof(stamp_data->frame), fmtstr, scene->r.cfra);
 	}
 	else {
 		stamp_data->frame[0] = '\0';
 	}
 
 	if (scene->r.stamp & R_STAMP_CAMERA) {
-		BLI_snprintf(stamp_data->camera, sizeof(stamp_data->camera), do_prefix ? "Camera %s":"%s", camera ? camera->id.name+2 : "<none>");
+		BLI_snprintf(stamp_data->camera, sizeof(stamp_data->camera), do_prefix ? "Camera %s" : "%s", camera ? camera->id.name + 2 : "<none>");
 	}
 	else {
 		stamp_data->camera[0] = '\0';
@@ -1294,41 +1294,41 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 		if (camera && camera->type == OB_CAMERA) {
 			BLI_snprintf(text, sizeof(text), "%.2f", ((Camera *)camera->data)->lens);
 		}
-		else 		BLI_strncpy(text, "<none>", sizeof(text));
+		else BLI_strncpy(text, "<none>", sizeof(text));
 
-		BLI_snprintf(stamp_data->cameralens, sizeof(stamp_data->cameralens), do_prefix ? "Lens %s":"%s", text);
+		BLI_snprintf(stamp_data->cameralens, sizeof(stamp_data->cameralens), do_prefix ? "Lens %s" : "%s", text);
 	}
 	else {
 		stamp_data->cameralens[0] = '\0';
 	}
 
 	if (scene->r.stamp & R_STAMP_SCENE) {
-		BLI_snprintf(stamp_data->scene, sizeof(stamp_data->scene), do_prefix ? "Scene %s":"%s", scene->id.name+2);
+		BLI_snprintf(stamp_data->scene, sizeof(stamp_data->scene), do_prefix ? "Scene %s" : "%s", scene->id.name + 2);
 	}
 	else {
 		stamp_data->scene[0] = '\0';
 	}
 	
 	if (scene->r.stamp & R_STAMP_SEQSTRIP) {
-		Sequence *seq= seq_foreground_frame_get(scene, scene->r.cfra);
+		Sequence *seq = seq_foreground_frame_get(scene, scene->r.cfra);
 	
-		if (seq)	BLI_strncpy(text, seq->name+2, sizeof(text));
-		else 		BLI_strncpy(text, "<none>", sizeof(text));
+		if (seq) BLI_strncpy(text, seq->name + 2, sizeof(text));
+		else BLI_strncpy(text, "<none>", sizeof(text));
 
-		BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), do_prefix ? "Strip %s":"%s", text);
+		BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), do_prefix ? "Strip %s" : "%s", text);
 	}
 	else {
 		stamp_data->strip[0] = '\0';
 	}
 
 	{
-		Render *re= RE_GetRender(scene->id.name);
-		RenderStats *stats= re ? RE_GetStats(re):NULL;
+		Render *re = RE_GetRender(scene->id.name);
+		RenderStats *stats = re ? RE_GetStats(re) : NULL;
 
 		if (stats && (scene->r.stamp & R_STAMP_RENDERTIME)) {
 			BLI_timestr(stats->lastframetime, text);
 
-			BLI_snprintf(stamp_data->rendertime, sizeof(stamp_data->rendertime), do_prefix ? "RenderTime %s":"%s", text);
+			BLI_snprintf(stamp_data->rendertime, sizeof(stamp_data->rendertime), do_prefix ? "RenderTime %s" : "%s", text);
 		}
 		else {
 			stamp_data->rendertime[0] = '\0';
@@ -1342,7 +1342,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	float w, h, pad;
 	int x, y, y_ofs;
 	float h_fixed;
-	const int mono= blf_mono_font_render; // XXX
+	const int mono = blf_mono_font_render; // XXX
 
 #define BUFF_MARGIN_X 2
 #define BUFF_MARGIN_Y 1
@@ -1354,29 +1354,29 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
 	/* TODO, do_versions */
 	if (scene->r.stamp_font_id < 8)
-		scene->r.stamp_font_id= 12;
+		scene->r.stamp_font_id = 12;
 
 	/* set before return */
 	BLF_size(mono, scene->r.stamp_font_id, 72);
 	
 	BLF_buffer(mono, rectf, rect, width, height, channels);
 	BLF_buffer_col(mono, scene->r.fg_stamp[0], scene->r.fg_stamp[1], scene->r.fg_stamp[2], 1.0);
-	pad= BLF_width_max(mono);
+	pad = BLF_width_max(mono);
 
 	/* use 'h_fixed' rather than 'h', aligns better */
-	h_fixed= BLF_height_max(mono);
+	h_fixed = BLF_height_max(mono);
 	y_ofs = -BLF_descender(mono);
 
-	x= 0;
-	y= height;
+	x = 0;
+	y = height;
 
 	if (stamp_data.file[0]) {
 		/* Top left corner */
-		BLF_width_and_height(mono, stamp_data.file, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.file, &w, &h); h = h_fixed;
 		y -= h;
 
 		/* also a little of space to the background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		/* and draw the text. */
 		BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1388,11 +1388,11 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
 	/* Top left corner, below File */
 	if (stamp_data.note[0]) {
-		BLF_width_and_height(mono, stamp_data.note, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.note, &w, &h); h = h_fixed;
 		y -= h;
 
 		/* and space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y-BUFF_MARGIN_Y, w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.note);
@@ -1403,11 +1403,11 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	
 	/* Top left corner, below File (or Note) */
 	if (stamp_data.date[0]) {
-		BLF_width_and_height(mono, stamp_data.date, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.date, &w, &h); h = h_fixed;
 		y -= h;
 
 		/* and space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y-BUFF_MARGIN_Y, w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.date);
@@ -1418,25 +1418,25 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
 	/* Top left corner, below File, Date or Note */
 	if (stamp_data.rendertime[0]) {
-		BLF_width_and_height(mono, stamp_data.rendertime, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.rendertime, &w, &h); h = h_fixed;
 		y -= h;
 
 		/* and space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y-BUFF_MARGIN_Y, w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.rendertime);
 	}
 
-	x= 0;
-	y= 0;
+	x = 0;
+	y = 0;
 
 	/* Bottom left corner, leaving space for timing */
 	if (stamp_data.marker[0]) {
-		BLF_width_and_height(mono, stamp_data.marker, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.marker, &w, &h); h = h_fixed;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		/* and pad the text. */
 		BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1448,10 +1448,10 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	
 	/* Left bottom corner */
 	if (stamp_data.time[0]) {
-		BLF_width_and_height(mono, stamp_data.time, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.time, &w, &h); h = h_fixed;
 
 		/* extra space for background */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		/* and pad the text. */
 		BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1462,10 +1462,10 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	}
 	
 	if (stamp_data.frame[0]) {
-		BLF_width_and_height(mono, stamp_data.frame, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.frame, &w, &h); h = h_fixed;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		/* and pad the text. */
 		BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1476,10 +1476,10 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	}
 
 	if (stamp_data.camera[0]) {
-		BLF_width_and_height(mono, stamp_data.camera, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.camera, &w, &h); h = h_fixed;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.camera);
 
@@ -1488,37 +1488,37 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 	}
 
 	if (stamp_data.cameralens[0]) {
-		BLF_width_and_height(mono, stamp_data.cameralens, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.cameralens, &w, &h); h = h_fixed;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.cameralens);
 	}
 	
 	if (stamp_data.scene[0]) {
-		BLF_width_and_height(mono, stamp_data.scene, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.scene, &w, &h); h = h_fixed;
 
 		/* Bottom right corner, with an extra space because blenfont is too strict! */
-		x= width - w - 2;
+		x = width - w - 2;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		/* and pad the text. */
-		BLF_position(mono, x, y+y_ofs, 0.0);
+		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.scene);
 	}
 	
 	if (stamp_data.strip[0]) {
-		BLF_width_and_height(mono, stamp_data.strip, &w, &h); h= h_fixed;
+		BLF_width_and_height(mono, stamp_data.strip, &w, &h); h = h_fixed;
 
 		/* Top right corner, with an extra space because blenfont is too strict! */
-		x= width - w - pad;
-		y= height - h;
+		x = width - w - pad;
+		y = height - h;
 
 		/* extra space for background. */
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-BUFF_MARGIN_X, y-BUFF_MARGIN_Y, x+w+BUFF_MARGIN_X, y+h+BUFF_MARGIN_Y);
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
 		BLF_position(mono, x, y + y_ofs, 0.0);
 		BLF_draw_buffer(mono, stamp_data.strip);
@@ -1535,38 +1535,38 @@ void BKE_imbuf_stamp_info(Scene *scene, Object *camera, struct ImBuf *ibuf)
 {
 	struct StampData stamp_data;
 
-	if (!ibuf)	return;
+	if (!ibuf) return;
 	
 	/* fill all the data values, no prefix */
 	stampdata(scene, camera, &stamp_data, 0);
 	
-	if (stamp_data.file[0])		IMB_metadata_change_field (ibuf, "File",		stamp_data.file);
-	if (stamp_data.note[0])		IMB_metadata_change_field (ibuf, "Note",		stamp_data.note);
-	if (stamp_data.date[0])		IMB_metadata_change_field (ibuf, "Date",		stamp_data.date);
-	if (stamp_data.marker[0])	IMB_metadata_change_field (ibuf, "Marker",	stamp_data.marker);
-	if (stamp_data.time[0])		IMB_metadata_change_field (ibuf, "Time",		stamp_data.time);
-	if (stamp_data.frame[0])	IMB_metadata_change_field (ibuf, "Frame",	stamp_data.frame);
-	if (stamp_data.camera[0])	IMB_metadata_change_field (ibuf, "Camera",	stamp_data.camera);
-	if (stamp_data.cameralens[0]) IMB_metadata_change_field (ibuf, "Lens",	stamp_data.cameralens);
-	if (stamp_data.scene[0])	IMB_metadata_change_field (ibuf, "Scene",	stamp_data.scene);
-	if (stamp_data.strip[0])	IMB_metadata_change_field (ibuf, "Strip",	stamp_data.strip);
-	if (stamp_data.rendertime[0]) IMB_metadata_change_field (ibuf, "RenderTime", stamp_data.rendertime);
+	if (stamp_data.file[0]) IMB_metadata_change_field(ibuf, "File",        stamp_data.file);
+	if (stamp_data.note[0]) IMB_metadata_change_field(ibuf, "Note",        stamp_data.note);
+	if (stamp_data.date[0]) IMB_metadata_change_field(ibuf, "Date",        stamp_data.date);
+	if (stamp_data.marker[0]) IMB_metadata_change_field(ibuf, "Marker",    stamp_data.marker);
+	if (stamp_data.time[0]) IMB_metadata_change_field(ibuf, "Time",        stamp_data.time);
+	if (stamp_data.frame[0]) IMB_metadata_change_field(ibuf, "Frame",      stamp_data.frame);
+	if (stamp_data.camera[0]) IMB_metadata_change_field(ibuf, "Camera",    stamp_data.camera);
+	if (stamp_data.cameralens[0]) IMB_metadata_change_field(ibuf, "Lens",  stamp_data.cameralens);
+	if (stamp_data.scene[0]) IMB_metadata_change_field(ibuf, "Scene",      stamp_data.scene);
+	if (stamp_data.strip[0]) IMB_metadata_change_field(ibuf, "Strip",      stamp_data.strip);
+	if (stamp_data.rendertime[0]) IMB_metadata_change_field(ibuf, "RenderTime", stamp_data.rendertime);
 }
 
 int BKE_imbuf_alpha_test(ImBuf *ibuf)
 {
 	int tot;
 	if (ibuf->rect_float) {
-		float *buf= ibuf->rect_float;
-		for (tot= ibuf->x * ibuf->y; tot--; buf+=4) {
+		float *buf = ibuf->rect_float;
+		for (tot = ibuf->x * ibuf->y; tot--; buf += 4) {
 			if (buf[3] < 1.0f) {
 				return TRUE;
 			}
 		}
 	}
 	else if (ibuf->rect) {
-		unsigned char *buf= (unsigned char *)ibuf->rect;
-		for (tot= ibuf->x * ibuf->y; tot--; buf+=4) {
+		unsigned char *buf = (unsigned char *)ibuf->rect;
+		for (tot = ibuf->x * ibuf->y; tot--; buf += 4) {
 			if (buf[3] != 255) {
 				return TRUE;
 			}
@@ -1580,73 +1580,73 @@ int BKE_imbuf_alpha_test(ImBuf *ibuf)
  * are already set */
 int BKE_imbuf_write(ImBuf *ibuf, const char *name, ImageFormatData *imf)
 {
-	char imtype= imf->imtype;
-	char compress= imf->compress;
-	char quality= imf->quality;
+	char imtype = imf->imtype;
+	char compress = imf->compress;
+	char quality = imf->quality;
 
 	int ok;
 
-	if (imtype== R_IMF_IMTYPE_IRIS) {
-		ibuf->ftype= IMAGIC;
+	if (imtype == R_IMF_IMTYPE_IRIS) {
+		ibuf->ftype = IMAGIC;
 	}
 #ifdef WITH_HDR
-	else if (imtype==R_IMF_IMTYPE_RADHDR) {
-		ibuf->ftype= RADHDR;
+	else if (imtype == R_IMF_IMTYPE_RADHDR) {
+		ibuf->ftype = RADHDR;
 	}
 #endif
 	else if (ELEM5(imtype, R_IMF_IMTYPE_PNG, R_IMF_IMTYPE_FFMPEG, R_IMF_IMTYPE_H264, R_IMF_IMTYPE_THEORA, R_IMF_IMTYPE_XVID)) {
-		ibuf->ftype= PNG;
+		ibuf->ftype = PNG;
 
-		if (imtype==R_IMF_IMTYPE_PNG)
+		if (imtype == R_IMF_IMTYPE_PNG)
 			ibuf->ftype |= compress;
 
 	}
 #ifdef WITH_DDS
-	else if (imtype==R_IMF_IMTYPE_DDS) {
-		ibuf->ftype= DDS;
+	else if (imtype == R_IMF_IMTYPE_DDS) {
+		ibuf->ftype = DDS;
 	}
 #endif
-	else if (imtype==R_IMF_IMTYPE_BMP) {
-		ibuf->ftype= BMP;
+	else if (imtype == R_IMF_IMTYPE_BMP) {
+		ibuf->ftype = BMP;
 	}
 #ifdef WITH_TIFF
-	else if (imtype==R_IMF_IMTYPE_TIFF) {
-		ibuf->ftype= TIF;
+	else if (imtype == R_IMF_IMTYPE_TIFF) {
+		ibuf->ftype = TIF;
 
 		if (imf->depth == R_IMF_CHAN_DEPTH_16)
 			ibuf->ftype |= TIF_16BIT;
 	}
 #endif
 #ifdef WITH_OPENEXR
-	else if (imtype==R_IMF_IMTYPE_OPENEXR || imtype==R_IMF_IMTYPE_MULTILAYER) {
-		ibuf->ftype= OPENEXR;
+	else if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER) {
+		ibuf->ftype = OPENEXR;
 		if (imf->depth == R_IMF_CHAN_DEPTH_16)
 			ibuf->ftype |= OPENEXR_HALF;
 		ibuf->ftype |= (imf->exr_codec & OPENEXR_COMPRESS);
 		
 		if (!(imf->flag & R_IMF_FLAG_ZBUF))
-			ibuf->zbuf_float = NULL;	/* signal for exr saving */
+			ibuf->zbuf_float = NULL;    /* signal for exr saving */
 		
 	}
 #endif
 #ifdef WITH_CINEON
-	else if (imtype==R_IMF_IMTYPE_CINEON) {
+	else if (imtype == R_IMF_IMTYPE_CINEON) {
 		ibuf->ftype = CINEON;
 	}
-	else if (imtype==R_IMF_IMTYPE_DPX) {
+	else if (imtype == R_IMF_IMTYPE_DPX) {
 		ibuf->ftype = DPX;
 	}
 #endif
-	else if (imtype==R_IMF_IMTYPE_TARGA) {
-		ibuf->ftype= TGA;
+	else if (imtype == R_IMF_IMTYPE_TARGA) {
+		ibuf->ftype = TGA;
 	}
-	else if (imtype==R_IMF_IMTYPE_RAWTGA) {
-		ibuf->ftype= RAWTGA;
+	else if (imtype == R_IMF_IMTYPE_RAWTGA) {
+		ibuf->ftype = RAWTGA;
 	}
 #ifdef WITH_OPENJPEG
-	else if (imtype==R_IMF_IMTYPE_JP2) {
-		if (quality < 10) quality= 90;
-		ibuf->ftype= JP2|quality;
+	else if (imtype == R_IMF_IMTYPE_JP2) {
+		if (quality < 10) quality = 90;
+		ibuf->ftype = JP2 | quality;
 		
 		if (imf->depth == R_IMF_CHAN_DEPTH_16) {
 			ibuf->ftype |= JP2_16BIT;
@@ -1668,8 +1668,8 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, ImageFormatData *imf)
 #endif
 	else {
 		/* R_IMF_IMTYPE_JPEG90, etc. default we save jpegs */
-		if (quality < 10) quality= 90;
-		ibuf->ftype= JPG|quality;
+		if (quality < 10) quality = 90;
+		ibuf->ftype = JPG | quality;
 	}
 	
 	BLI_make_existing_file(name);
@@ -1685,21 +1685,21 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, ImageFormatData *imf)
 /* same as BKE_imbuf_write() but crappy workaround not to perminantly modify
  * _some_, values in the imbuf */
 int BKE_imbuf_write_as(ImBuf *ibuf, const char *name, ImageFormatData *imf,
-                      const short save_copy)
+                       const short save_copy)
 {
-	ImBuf ibuf_back= *ibuf;
+	ImBuf ibuf_back = *ibuf;
 	int ok;
 
 	/* all data is rgba anyway,
 	 * this just controls how to save for some formats */
-	ibuf->planes= imf->planes;
+	ibuf->planes = imf->planes;
 
-	ok= BKE_imbuf_write(ibuf, name, imf);
+	ok = BKE_imbuf_write(ibuf, name, imf);
 
 	if (save_copy) {
 		/* note that we are not restoring _all_ settings */
-		ibuf->planes= ibuf_back.planes;
-		ibuf->ftype=  ibuf_back.ftype;
+		ibuf->planes = ibuf_back.planes;
+		ibuf->ftype =  ibuf_back.ftype;
 	}
 
 	return ok;
@@ -1716,8 +1716,8 @@ int BKE_imbuf_write_stamp(Scene *scene, struct Object *camera, ImBuf *ibuf, cons
 
 void BKE_makepicstring(char *string, const char *base, const char *relbase, int frame, const char imtype, const short use_ext, const short use_frames)
 {
-	if (string==NULL) return;
-	BLI_strncpy(string, base, FILE_MAX - 10);	/* weak assumption */
+	if (string == NULL) return;
+	BLI_strncpy(string, base, FILE_MAX - 10);   /* weak assumption */
 	BLI_path_abs(string, relbase);
 
 	if (use_frames)
@@ -1729,8 +1729,7 @@ void BKE_makepicstring(char *string, const char *base, const char *relbase, int
 }
 
 /* used by sequencer too */
-struct anim *openanim(const char *name, int flags, int streamindex)
-{
+struct anim *openanim(const char *name, int flags, int streamindex){
 	struct anim *anim;
 	struct ImBuf *ibuf;
 	
@@ -1778,16 +1777,16 @@ Image *BKE_image_verify_viewer(int type, const char *name)
 {
 	Image *ima;
 	
-	for (ima=G.main->image.first; ima; ima= ima->id.next)
-		if (ima->source==IMA_SRC_VIEWER)
-			if (ima->type==type)
+	for (ima = G.main->image.first; ima; ima = ima->id.next)
+		if (ima->source == IMA_SRC_VIEWER)
+			if (ima->type == type)
 				break;
 	
-	if (ima==NULL)
-		ima= image_alloc(name, IMA_SRC_VIEWER, type);
+	if (ima == NULL)
+		ima = image_alloc(name, IMA_SRC_VIEWER, type);
 	
 	/* happens on reload, imagewindow cannot be image user when hidden*/
-	if (ima->id.us==0)
+	if (ima->id.us == 0)
 		id_us_plus(&ima->id);
 
 	return ima;
@@ -1800,78 +1799,78 @@ void BKE_image_assign_ibuf(Image *ima, ImBuf *ibuf)
 
 void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 {
-	if (ima==NULL)
+	if (ima == NULL)
 		return;
 	
 	switch (signal) {
-	case IMA_SIGNAL_FREE:
-		image_free_buffers(ima);
-		if (iuser)
-			iuser->ok= 1;
-		break;
-	case IMA_SIGNAL_SRC_CHANGE:
-		if (ima->type == IMA_TYPE_UV_TEST)
-			if (ima->source != IMA_SRC_GENERATED)
-				ima->type= IMA_TYPE_IMAGE;
-
-		if (ima->source==IMA_SRC_GENERATED) {
-			if (ima->gen_x==0 || ima->gen_y==0) {
-				ImBuf *ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
-				if (ibuf) {
-					ima->gen_x= ibuf->x;
-					ima->gen_y= ibuf->y;
+		case IMA_SIGNAL_FREE:
+			image_free_buffers(ima);
+			if (iuser)
+				iuser->ok = 1;
+			break;
+		case IMA_SIGNAL_SRC_CHANGE:
+			if (ima->type == IMA_TYPE_UV_TEST)
+				if (ima->source != IMA_SRC_GENERATED)
+					ima->type = IMA_TYPE_IMAGE;
+
+			if (ima->source == IMA_SRC_GENERATED) {
+				if (ima->gen_x == 0 || ima->gen_y == 0) {
+					ImBuf *ibuf = image_get_ibuf(ima, IMA_NO_INDEX, 0);
+					if (ibuf) {
+						ima->gen_x = ibuf->x;
+						ima->gen_y = ibuf->y;
+					}
 				}
 			}
-		}
-
-		/* force reload on first use, but not for multilayer, that makes nodes and buttons in ui drawing fail */
-		if (ima->type!=IMA_TYPE_MULTILAYER)
-			image_free_buffers(ima);
 
-		ima->ok= 1;
-		if (iuser)
-			iuser->ok= 1;
-		break;
-			
-	case IMA_SIGNAL_RELOAD:
-		/* try to repack file */
-		if (ima->packedfile) {
-			PackedFile *pf;
-			pf = newPackedFile(NULL, ima->name, ID_BLEND_PATH(G.main, &ima->id));
-			if (pf) {
-				freePackedFile(ima->packedfile);
-				ima->packedfile = pf;
+			/* force reload on first use, but not for multilayer, that makes nodes and buttons in ui drawing fail */
+			if (ima->type != IMA_TYPE_MULTILAYER)
 				image_free_buffers(ima);
+
+			ima->ok = 1;
+			if (iuser)
+				iuser->ok = 1;
+			break;
+
+		case IMA_SIGNAL_RELOAD:
+			/* try to repack file */
+			if (ima->packedfile) {
+				PackedFile *pf;
+				pf = newPackedFile(NULL, ima->name, ID_BLEND_PATH(G.main, &ima->id));
+				if (pf) {
+					freePackedFile(ima->packedfile);
+					ima->packedfile = pf;
+					image_free_buffers(ima);
+				}
+				else {
+					printf("ERROR: Image not available. Keeping packed image\n");
+				}
 			}
-			else {
-				printf("ERROR: Image not available. Keeping packed image\n");
-			}
-		}
-		else
-			image_free_buffers(ima);
+			else
+				image_free_buffers(ima);
 		
-		if (iuser)
-			iuser->ok= 1;
+			if (iuser)
+				iuser->ok = 1;
 		
-		break;
-	case IMA_SIGNAL_USER_NEW_IMAGE:
-		if (iuser) {
-			iuser->ok= 1;
-			if (ima->source==IMA_SRC_FILE || ima->source==IMA_SRC_SEQUENCE) {
-				if (ima->type==IMA_TYPE_MULTILAYER) {
-					iuser->multi_index= 0;
-					iuser->layer= iuser->pass= 0;
+			break;
+		case IMA_SIGNAL_USER_NEW_IMAGE:
+			if (iuser) {
+				iuser->ok = 1;
+				if (ima->source == IMA_SRC_FILE || ima->source == IMA_SRC_SEQUENCE) {
+					if (ima->type == IMA_TYPE_MULTILAYER) {
+						iuser->multi_index = 0;
+						iuser->layer = iuser->pass = 0;
+					}
 				}
 			}
-		}
-		break;
+			break;
 	}
 	
 	/* don't use notifiers because they are not 100% sure to succeeded
 	 * this also makes sure all scenes are accounted for. */
 	{
 		Scene *scene;
-		for (scene= G.main->scene.first; scene; scene= scene->id.next) {
+		for (scene = G.main->scene.first; scene; scene = scene->id.next) {
 			if (scene->nodetree) {
 				nodeUpdateID(scene->nodetree, &ima->id);
 			}
@@ -1885,32 +1884,32 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 RenderPass *BKE_image_multilayer_index(RenderResult *rr, ImageUser *iuser)
 {
 	RenderLayer *rl;
-	RenderPass *rpass= NULL;
+	RenderPass *rpass = NULL;
 	
-	if (rr==NULL) 
+	if (rr == NULL)
 		return NULL;
 	
 	if (iuser) {
-		short index= 0, rl_index= 0, rp_index;
+		short index = 0, rl_index = 0, rp_index;
 		
-		for (rl= rr->layers.first; rl; rl= rl->next, rl_index++) {
-			rp_index= 0;
-			for (rpass= rl->passes.first; rpass; rpass= rpass->next, index++, rp_index++)
-				if (iuser->layer==rl_index && iuser->pass==rp_index)
+		for (rl = rr->layers.first; rl; rl = rl->next, rl_index++) {
+			rp_index = 0;
+			for (rpass = rl->passes.first; rpass; rpass = rpass->next, index++, rp_index++)
+				if (iuser->layer == rl_index && iuser->pass == rp_index)
 					break;
 			if (rpass)
 				break;
 		}
 		
 		if (rpass)
-			iuser->multi_index= index;
+			iuser->multi_index = index;
 		else 
-			iuser->multi_index= 0;
+			iuser->multi_index = 0;
 	}
-	if (rpass==NULL) {
-		rl= rr->layers.first;
+	if (rpass == NULL) {
+		rl = rr->layers.first;
 		if (rl)
-			rpass= rl->passes.first;
+			rpass = rl->passes.first;
 	}
 	
 	return rpass;
@@ -1921,7 +1920,7 @@ RenderResult *BKE_image_acquire_renderresult(Scene *scene, Image *ima)
 	if (ima->rr) {
 		return ima->rr;
 	}
-	else if (ima->type==IMA_TYPE_R_RESULT) {
+	else if (ima->type == IMA_TYPE_R_RESULT) {
 		if (ima->render_slot == ima->last_render_slot)
 			return RE_AcquireResultRead(RE_GetRender(scene->id.name));
 		else
@@ -1933,8 +1932,8 @@ RenderResult *BKE_image_acquire_renderresult(Scene *scene, Image *ima)
 
 void BKE_image_release_renderresult(Scene *scene, Image *ima)
 {
-	if (ima->rr);
-	else if (ima->type==IMA_TYPE_R_RESULT) {
+	if (ima->rr) ;
+	else if (ima->type == IMA_TYPE_R_RESULT) {
 		if (ima->render_slot == ima->last_render_slot)
 			RE_ReleaseResult(RE_GetRender(scene->id.name));
 	}
@@ -1944,20 +1943,20 @@ void BKE_image_backup_render(Scene *scene, Image *ima)
 {
 	/* called right before rendering, ima->renders contains render
 	 * result pointers for everything but the current render */
-	Render *re= RE_GetRender(scene->id.name);
-	int slot= ima->render_slot, last= ima->last_render_slot;
+	Render *re = RE_GetRender(scene->id.name);
+	int slot = ima->render_slot, last = ima->last_render_slot;
 
 	if (slot != last) {
 		if (ima->renders[slot]) {
 			RE_FreeRenderResult(ima->renders[slot]);
-			ima->renders[slot]= NULL;
+			ima->renders[slot] = NULL;
 		}
 
-		ima->renders[last]= NULL;
+		ima->renders[last] = NULL;
 		RE_SwapResult(re, &ima->renders[last]);
 	}
 
-	ima->last_render_slot= slot;
+	ima->last_render_slot = slot;
 }
 
 /* after imbuf load, openexr type can return with a exrhandle open */
@@ -1965,22 +1964,22 @@ void BKE_image_backup_render(Scene *scene, Image *ima)
 static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
 {
 	
-	ima->rr= RE_MultilayerConvert(ibuf->userdata, ibuf->x, ibuf->y);
+	ima->rr = RE_MultilayerConvert(ibuf->userdata, ibuf->x, ibuf->y);
 
 #ifdef WITH_OPENEXR
 	IMB_exr_close(ibuf->userdata);
 #endif
 
-	ibuf->userdata= NULL;
+	ibuf->userdata = NULL;
 	if (ima->rr)
-		ima->rr->framenr= framenr;
+		ima->rr->framenr = framenr;
 }
 
 /* common stuff to do with images after loading */
 static void image_initialize_after_load(Image *ima, ImBuf *ibuf)
 {
 	/* preview is NULL when it has never been used as an icon before */
-	if (G.background==0 && ima->preview==NULL)
+	if (G.background == 0 && ima->preview == NULL)
 		BKE_icon_changed(BKE_icon_getid(&ima->id));
 
 	/* fields */
@@ -1991,7 +1990,7 @@ static void image_initialize_after_load(Image *ima, ImBuf *ibuf)
 	/* timer */
 	ima->lastused = clock() / CLOCKS_PER_SEC;
 	
-	ima->ok= IMA_OK_LOADED;
+	ima->ok = IMA_OK_LOADED;
 	
 }
 
@@ -2006,14 +2005,14 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 	if (ima->lastframe != frame)
 		ima->tpageflag |= IMA_TPAGE_REFRESH;
 
-	ima->lastframe= frame;
+	ima->lastframe = frame;
 	BLI_strncpy(name, ima->name, sizeof(name));
 	BLI_stringdec(name, head, tail, &numlen);
 	BLI_stringenc(name, head, tail, numlen, frame);
 
 	BLI_path_abs(name, ID_BLEND_PATH(G.main, &ima->id));
 	
-	flag= IB_rect|IB_multilayer;
+	flag = IB_rect | IB_multilayer;
 	if (ima->flag & IMA_DO_PREMUL)
 		flag |= IB_premul;
 
@@ -2022,21 +2021,21 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 
 #if 0
 	if (ibuf) {
-		printf(AT" loaded %s\n", name);
+		printf(AT " loaded %s\n", name);
 	}
 	else {
-		printf(AT" missed %s\n", name);
+		printf(AT " missed %s\n", name);
 	}
 #endif
 
 	if (ibuf) {
 #ifdef WITH_OPENEXR
 		/* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
-		if (ibuf->ftype==OPENEXR && ibuf->userdata) {
+		if (ibuf->ftype == OPENEXR && ibuf->userdata) {
 			image_create_multilayer(ima, ibuf, frame);	
-			ima->type= IMA_TYPE_MULTILAYER;
+			ima->type = IMA_TYPE_MULTILAYER;
 			IMB_freeImBuf(ibuf);
-			ibuf= NULL;
+			ibuf = NULL;
 		}
 		else {
 			image_initialize_after_load(ima, ibuf);
@@ -2048,30 +2047,30 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 #endif
 	}
 	else
-		ima->ok= 0;
+		ima->ok = 0;
 	
 	if (iuser)
-		iuser->ok= ima->ok;
+		iuser->ok = ima->ok;
 	
 	return ibuf;
 }
 
 static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int frame)
 {
-	struct ImBuf *ibuf= NULL;
+	struct ImBuf *ibuf = NULL;
 	
 	/* either we load from RenderResult, or we have to load a new one */
 	
 	/* check for new RenderResult */
-	if (ima->rr==NULL || frame!=ima->rr->framenr) {
+	if (ima->rr == NULL || frame != ima->rr->framenr) {
 		/* copy to survive not found multilayer image */
-		RenderResult *oldrr= ima->rr;
+		RenderResult *oldrr = ima->rr;
 	
-		ima->rr= NULL;
+		ima->rr = NULL;
 		ibuf = image_load_sequence_file(ima, iuser, frame);
 		
 		if (ibuf) { /* actually an error */
-			ima->type= IMA_TYPE_IMAGE;
+			ima->type = IMA_TYPE_IMAGE;
 			printf("error, multi is normal image\n");
 		}
 		// printf("loaded new result %p\n", ima->rr);
@@ -2081,34 +2080,34 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
 			if (oldrr) RE_FreeRenderResult(oldrr);
 		}
 		else {
-			ima->rr= oldrr;
+			ima->rr = oldrr;
 		}
 
 	}
 	if (ima->rr) {
-		RenderPass *rpass= BKE_image_multilayer_index(ima->rr, iuser);
+		RenderPass *rpass = BKE_image_multilayer_index(ima->rr, iuser);
 		
 		if (rpass) {
 			// printf("load from pass %s\n", rpass->name);
 			/* since we free  render results, we copy the rect */
-			ibuf= IMB_allocImBuf(ima->rr->rectx, ima->rr->recty, 32, 0);
-			ibuf->rect_float= MEM_dupallocN(rpass->rect);
+			ibuf = IMB_allocImBuf(ima->rr->rectx, ima->rr->recty, 32, 0);
+			ibuf->rect_float = MEM_dupallocN(rpass->rect);
 			ibuf->flags |= IB_rectfloat;
-			ibuf->mall= IB_rectfloat;
-			ibuf->channels= rpass->channels;
+			ibuf->mall = IB_rectfloat;
+			ibuf->channels = rpass->channels;
 			ibuf->profile = IB_PROFILE_LINEAR_RGB;
 			
 			image_initialize_after_load(ima, ibuf);
-			image_assign_ibuf(ima, ibuf, iuser?iuser->multi_index:0, frame);
+			image_assign_ibuf(ima, ibuf, iuser ? iuser->multi_index : 0, frame);
 			
 		}
 		// else printf("pass not found\n");
 	}
 	else
-		ima->ok= 0;
+		ima->ok = 0;
 	
 	if (iuser)
-		iuser->ok= ima->ok;
+		iuser->ok = ima->ok;
 	
 	return ibuf;
 }
@@ -2116,11 +2115,11 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
 
 static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 {
-	struct ImBuf *ibuf= NULL;
+	struct ImBuf *ibuf = NULL;
 	
-	ima->lastframe= frame;
+	ima->lastframe = frame;
 	
-	if (ima->anim==NULL) {
+	if (ima->anim == NULL) {
 		char str[FILE_MAX];
 		
 		BLI_strncpy(str, ima->name, FILE_MAX);
@@ -2130,35 +2129,35 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 		ima->anim = openanim(str, IB_rect, 0);
 		
 		/* let's initialize this user */
-		if (ima->anim && iuser && iuser->frames==0)
-			iuser->frames= IMB_anim_get_duration(ima->anim,
-							     IMB_TC_RECORD_RUN);
+		if (ima->anim && iuser && iuser->frames == 0)
+			iuser->frames = IMB_anim_get_duration(ima->anim,
+			                                      IMB_TC_RECORD_RUN);
 	}
 	
 	if (ima->anim) {
 		int dur = IMB_anim_get_duration(ima->anim,
-						IMB_TC_RECORD_RUN);
-		int fra= frame-1;
+		                                IMB_TC_RECORD_RUN);
+		int fra = frame - 1;
 		
-		if (fra<0) fra = 0;
-		if (fra>(dur-1)) fra= dur-1;
+		if (fra < 0) fra = 0;
+		if (fra > (dur - 1)) fra = dur - 1;
 		ibuf = IMB_makeSingleUser(
-			IMB_anim_absolute(ima->anim, fra,
-					  IMB_TC_RECORD_RUN,
-					  IMB_PROXY_NONE));
+		    IMB_anim_absolute(ima->anim, fra,
+		                      IMB_TC_RECORD_RUN,
+		                      IMB_PROXY_NONE));
 		
 		if (ibuf) {
 			image_initialize_after_load(ima, ibuf);
 			image_assign_ibuf(ima, ibuf, 0, frame);
 		}
 		else
-			ima->ok= 0;
+			ima->ok = 0;
 	}
 	else
-		ima->ok= 0;
+		ima->ok = 0;
 	
 	if (iuser)
-		iuser->ok= ima->ok;
+		iuser->ok = ima->ok;
 	
 	return ibuf;
 }
@@ -2175,13 +2174,13 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 	
 	/* is there a PackedFile with this image ? */
 	if (ima->packedfile) {
-		flag = IB_rect|IB_multilayer;
+		flag = IB_rect | IB_multilayer;
 		if (ima->flag & IMA_DO_PREMUL) flag |= IB_premul;
 		
-		ibuf = IMB_ibImageFromMemory((unsigned char*)ima->packedfile->data, ima->packedfile->size, flag, "<packed data>");
+		ibuf = IMB_ibImageFromMemory((unsigned char *)ima->packedfile->data, ima->packedfile->size, flag, "<packed data>");
 	} 
 	else {
-		flag= IB_rect|IB_multilayer|IB_metadata;
+		flag = IB_rect | IB_multilayer | IB_metadata;
 		if (ima->flag & IMA_DO_PREMUL)
 			flag |= IB_premul;
 			
@@ -2195,15 +2194,15 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 	
 	if (ibuf) {
 		/* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
-		if (ibuf->ftype==OPENEXR && ibuf->userdata) {
+		if (ibuf->ftype == OPENEXR && ibuf->userdata) {
 			image_create_multilayer(ima, ibuf, cfra);	
-			ima->type= IMA_TYPE_MULTILAYER;
+			ima->type = IMA_TYPE_MULTILAYER;
 			IMB_freeImBuf(ibuf);
-			ibuf= NULL;
+			ibuf = NULL;
 		}
 		else {
 			image_initialize_after_load(ima, ibuf);
-			assign= 1;
+			assign = 1;
 
 			/* check if the image is a font image... */
 			detectBitmapFont(ibuf);
@@ -2214,49 +2213,49 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 		}
 	}
 	else
-		ima->ok= 0;
+		ima->ok = 0;
 	
 	if (assign)
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 
 	if (iuser)
-		iuser->ok= ima->ok;
+		iuser->ok = ima->ok;
 	
 	return ibuf;
 }
 
 static ImBuf *image_get_ibuf_multilayer(Image *ima, ImageUser *iuser)
 {
-	ImBuf *ibuf= NULL;
+	ImBuf *ibuf = NULL;
 	
-	if (ima->rr==NULL) {
+	if (ima->rr == NULL) {
 		ibuf = image_load_image_file(ima, iuser, 0);
 		if (ibuf) { /* actually an error */
-			ima->type= IMA_TYPE_IMAGE;
+			ima->type = IMA_TYPE_IMAGE;
 			return ibuf;
 		}
 	}
 	if (ima->rr) {
-		RenderPass *rpass= BKE_image_multilayer_index(ima->rr, iuser);
+		RenderPass *rpass = BKE_image_multilayer_index(ima->rr, iuser);
 
 		if (rpass) {
-			ibuf= IMB_allocImBuf(ima->rr->rectx, ima->rr->recty, 32, 0);
+			ibuf = IMB_allocImBuf(ima->rr->rectx, ima->rr->recty, 32, 0);
 			
 			image_initialize_after_load(ima, ibuf);
 			
-			ibuf->rect_float= rpass->rect;
+			ibuf->rect_float = rpass->rect;
 			ibuf->flags |= IB_rectfloat;
-			ibuf->channels= rpass->channels;
+			ibuf->channels = rpass->channels;
 			ibuf->profile = IB_PROFILE_LINEAR_RGB;
 
-			image_assign_ibuf(ima, ibuf, iuser?iuser->multi_index:IMA_NO_INDEX, 0);
+			image_assign_ibuf(ima, ibuf, iuser ? iuser->multi_index : IMA_NO_INDEX, 0);
 		}
 	}
 	
-	if (ibuf==NULL) 
-		ima->ok= 0;
+	if (ibuf == NULL)
+		ima->ok = 0;
 	if (iuser)
-		iuser->ok= ima->ok;
+		iuser->ok = ima->ok;
 	
 	return ibuf;
 }
@@ -2274,7 +2273,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 	float dither;
 	int channels, layer, pass;
 	ImBuf *ibuf;
-	int from_render= (ima->render_slot == ima->last_render_slot);
+	int from_render = (ima->render_slot == ima->last_render_slot);
 
 	if (!(iuser && iuser->scene))
 		return NULL;
@@ -2283,18 +2282,18 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 	if (!lock_r)
 		return NULL;
 
-	re= RE_GetRender(iuser->scene->id.name);
+	re = RE_GetRender(iuser->scene->id.name);
 
-	channels= 4;
-	layer= (iuser)? iuser->layer: 0;
-	pass= (iuser)? iuser->pass: 0;
+	channels = 4;
+	layer = (iuser) ? iuser->layer : 0;
+	pass = (iuser) ? iuser->pass : 0;
 
 	if (from_render) {
 		RE_AcquireResultImage(re, &rres);
 	}
 	else if (ima->renders[ima->render_slot]) {
-		rres= *(ima->renders[ima->render_slot]);
-		rres.have_combined= rres.rectf != NULL;
+		rres = *(ima->renders[ima->render_slot]);
+		rres.have_combined = rres.rectf != NULL;
 	}
 	else
 		memset(&rres, 0, sizeof(RenderResult));
@@ -2308,83 +2307,83 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 	/* release is done in BKE_image_release_ibuf using lock_r */
 	if (from_render) {
 		BLI_lock_thread(LOCK_VIEWER);
-		*lock_r= re;
+		*lock_r = re;
 	}
 
 	/* this gives active layer, composite or seqence result */
-	rect= (unsigned int *)rres.rect32;
-	rectf= rres.rectf;
-	rectz= rres.rectz;
-	dither= iuser->scene->r.dither_intensity;
+	rect = (unsigned int *)rres.rect32;
+	rectf = rres.rectf;
+	rectz = rres.rectz;
+	dither = iuser->scene->r.dither_intensity;
 
 	/* combined layer gets added as first layer */
-	if (rres.have_combined && layer==0);
+	if (rres.have_combined && layer == 0) ;
 	else if (rres.layers.first) {
-		RenderLayer *rl= BLI_findlink(&rres.layers, layer-(rres.have_combined?1:0));
+		RenderLayer *rl = BLI_findlink(&rres.layers, layer - (rres.have_combined ? 1 : 0));
 		if (rl) {
 			RenderPass *rpass;
 
 			/* there's no combined pass, is in renderlayer itself */
-			if (pass==0) {
-				rectf= rl->rectf;
+			if (pass == 0) {
+				rectf = rl->rectf;
 			}
 			else {
-				rpass= BLI_findlink(&rl->passes, pass-1);
+				rpass = BLI_findlink(&rl->passes, pass - 1);
 				if (rpass) {
-					channels= rpass->channels;
-					rectf= rpass->rect;
-					dither= 0.0f; /* don't dither passes */
+					channels = rpass->channels;
+					rectf = rpass->rect;
+					dither = 0.0f; /* don't dither passes */
 				}
 			}
 
-			for (rpass= rl->passes.first; rpass; rpass= rpass->next)
+			for (rpass = rl->passes.first; rpass; rpass = rpass->next)
 				if (rpass->passtype == SCE_PASS_Z)
-					rectz= rpass->rect;
+					rectz = rpass->rect;
 		}
 	}
 
-	ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
+	ibuf = image_get_ibuf(ima, IMA_NO_INDEX, 0);
 
 	/* make ibuf if needed, and initialize it */
-	if (ibuf==NULL) {
-		ibuf= IMB_allocImBuf(rres.rectx, rres.recty, 32, 0);
+	if (ibuf == NULL) {
+		ibuf = IMB_allocImBuf(rres.rectx, rres.recty, 32, 0);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 	}
 
-	ibuf->x= rres.rectx;
-	ibuf->y= rres.recty;
+	ibuf->x = rres.rectx;
+	ibuf->y = rres.recty;
 	
 	/* free rect buffer if float buffer changes, so it can be recreated with
 	 * the updated result, and also in case we got byte buffer from sequencer,
 	 * so we don't keep reference to freed buffer */
-	if (ibuf->rect_float!=rectf || rect || !rectf)
+	if (ibuf->rect_float != rectf || rect || !rectf)
 		imb_freerectImBuf(ibuf);
 
 	if (rect)
-		ibuf->rect= rect;
+		ibuf->rect = rect;
 	
 	if (rectf) {
-		ibuf->rect_float= rectf;
+		ibuf->rect_float = rectf;
 		ibuf->flags |= IB_rectfloat;
-		ibuf->channels= channels;
+		ibuf->channels = channels;
 	}
 	else {
-		ibuf->rect_float= NULL;
+		ibuf->rect_float = NULL;
 		ibuf->flags &= ~IB_rectfloat;
 	}
 
 	if (rectz) {
-		ibuf->zbuf_float= rectz;
+		ibuf->zbuf_float = rectz;
 		ibuf->flags |= IB_zbuffloat;
 	}
 	else {
-		ibuf->zbuf_float= NULL;
+		ibuf->zbuf_float = NULL;
 		ibuf->flags &= ~IB_zbuffloat;
 	}
 
 	/* since its possible to access the buffer from the image directly, set the profile [#25073] */
-	ibuf->profile= (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_NONE;
-	ibuf->dither= dither;
+	ibuf->profile = (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_NONE;
+	ibuf->dither = dither;
 
 	if (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE) {
 		ibuf->flags |= IB_cm_predivide;
@@ -2395,7 +2394,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 		ima->flag &= ~IMA_CM_PREDIVIDE;
 	}
 
-	ima->ok= IMA_OK_LOADED;
+	ima->ok = IMA_OK_LOADED;
 
 	return ibuf;
 }
@@ -2406,18 +2405,18 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
 	int frame = 0, index = 0;
 
 	/* see if we already have an appropriate ibuf, with image source and type */
-	if (ima->source==IMA_SRC_MOVIE) {
-		frame= iuser?iuser->framenr:ima->lastframe;
-		ibuf= image_get_ibuf(ima, 0, frame);
+	if (ima->source == IMA_SRC_MOVIE) {
+		frame = iuser ? iuser->framenr : ima->lastframe;
+		ibuf = image_get_ibuf(ima, 0, frame);
 		/* XXX temp stuff? */
 		if (ima->lastframe != frame)
 			ima->tpageflag |= IMA_TPAGE_REFRESH;
 		ima->lastframe = frame;
 	}
-	else if (ima->source==IMA_SRC_SEQUENCE) {
-		if (ima->type==IMA_TYPE_IMAGE) {
-			frame= iuser?iuser->framenr:ima->lastframe;
-			ibuf= image_get_ibuf(ima, 0, frame);
+	else if (ima->source == IMA_SRC_SEQUENCE) {
+		if (ima->type == IMA_TYPE_IMAGE) {
+			frame = iuser ? iuser->framenr : ima->lastframe;
+			ibuf = image_get_ibuf(ima, 0, frame);
 			
 			/* XXX temp stuff? */
 			if (ima->lastframe != frame) {
@@ -2425,20 +2424,20 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
 			}
 			ima->lastframe = frame;
 		}	
-		else if (ima->type==IMA_TYPE_MULTILAYER) {
-			frame= iuser?iuser->framenr:ima->lastframe;
-			index= iuser?iuser->multi_index:IMA_NO_INDEX;
-			ibuf= image_get_ibuf(ima, index, frame);
+		else if (ima->type == IMA_TYPE_MULTILAYER) {
+			frame = iuser ? iuser->framenr : ima->lastframe;
+			index = iuser ? iuser->multi_index : IMA_NO_INDEX;
+			ibuf = image_get_ibuf(ima, index, frame);
 		}
 	}
-	else if (ima->source==IMA_SRC_FILE) {
-		if (ima->type==IMA_TYPE_IMAGE)
-			ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
-		else if (ima->type==IMA_TYPE_MULTILAYER)
-			ibuf= image_get_ibuf(ima, iuser?iuser->multi_index:IMA_NO_INDEX, 0);
+	else if (ima->source == IMA_SRC_FILE) {
+		if (ima->type == IMA_TYPE_IMAGE)
+			ibuf = image_get_ibuf(ima, IMA_NO_INDEX, 0);
+		else if (ima->type == IMA_TYPE_MULTILAYER)
+			ibuf = image_get_ibuf(ima, iuser ? iuser->multi_index : IMA_NO_INDEX, 0);
 	}
 	else if (ima->source == IMA_SRC_GENERATED) {
-		ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
+		ibuf = image_get_ibuf(ima, IMA_NO_INDEX, 0);
 	}
 	else if (ima->source == IMA_SRC_VIEWER) {
 		/* always verify entirely, not that this shouldn't happen
@@ -2457,9 +2456,9 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
  * if not, use BKE_image_get_ibuf which doesn't require a release */
 ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 {
-	ImBuf *ibuf= NULL;
+	ImBuf *ibuf = NULL;
 	float color[] = {0, 0, 0, 1};
-	int frame= 0, index= 0;
+	int frame = 0, index = 0;
 
 	/* This function is intended to be thread-safe. It postpones the mutex lock
 	 * until it needs to load the image, if the image is already there it
@@ -2473,20 +2472,20 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 	 * 2) set ima/iuser->ok to 0 to IMA_OK_LOADED */
 	
 	if (lock_r)
-		*lock_r= NULL;
+		*lock_r = NULL;
 
 	/* quick reject tests */
-	if (ima==NULL) 
+	if (ima == NULL)
 		return NULL;
 	if (iuser) {
-		if (iuser->ok==0)
+		if (iuser->ok == 0)
 			return NULL;
 	}
-	else if (ima->ok==0)
+	else if (ima->ok == 0)
 		return NULL;
 	
 	/* try to get the ibuf without locking */
-	ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
+	ibuf = image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
 
 	if (ibuf == NULL) {
 		/* couldn't get ibuf and image is not ok, so let's lock and try to
@@ -2496,75 +2495,75 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 		/* need to check ok flag and loading ibuf again, because the situation
 		 * might have changed in the meantime */
 		if (iuser) {
-			if (iuser->ok==0) {
+			if (iuser->ok == 0) {
 				BLI_unlock_thread(LOCK_IMAGE);
 				return NULL;
 			}
 		}
-		else if (ima->ok==0) {
+		else if (ima->ok == 0) {
 			BLI_unlock_thread(LOCK_IMAGE);
 			return NULL;
 		}
 
-		ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
+		ibuf = image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
 
 		if (ibuf == NULL) {
 			/* we are sure we have to load the ibuf, using source and type */
-			if (ima->source==IMA_SRC_MOVIE) {
+			if (ima->source == IMA_SRC_MOVIE) {
 				/* source is from single file, use flipbook to store ibuf */
-				ibuf= image_load_movie_file(ima, iuser, frame);
+				ibuf = image_load_movie_file(ima, iuser, frame);
 			}
-			else if (ima->source==IMA_SRC_SEQUENCE) {
-				if (ima->type==IMA_TYPE_IMAGE) {
+			else if (ima->source == IMA_SRC_SEQUENCE) {
+				if (ima->type == IMA_TYPE_IMAGE) {
 					/* regular files, ibufs in flipbook, allows saving */
-					ibuf= image_load_sequence_file(ima, iuser, frame);
+					ibuf = image_load_sequence_file(ima, iuser, frame);
 				}
 				/* no else; on load the ima type can change */
-				if (ima->type==IMA_TYPE_MULTILAYER) {
+				if (ima->type == IMA_TYPE_MULTILAYER) {
 					/* only 1 layer/pass stored in imbufs, no exrhandle anim storage, no saving */
-					ibuf= image_load_sequence_multilayer(ima, iuser, frame);
+					ibuf = image_load_sequence_multilayer(ima, iuser, frame);
 				}
 			}
-			else if (ima->source==IMA_SRC_FILE) {
+			else if (ima->source == IMA_SRC_FILE) {
 				
-				if (ima->type==IMA_TYPE_IMAGE)
-					ibuf= image_load_image_file(ima, iuser, frame);	/* cfra only for '#', this global is OK */
+				if (ima->type == IMA_TYPE_IMAGE)
+					ibuf = image_load_image_file(ima, iuser, frame);  /* cfra only for '#', this global is OK */
 				/* no else; on load the ima type can change */
-				if (ima->type==IMA_TYPE_MULTILAYER)
+				if (ima->type == IMA_TYPE_MULTILAYER)
 					/* keeps render result, stores ibufs in listbase, allows saving */
-					ibuf= image_get_ibuf_multilayer(ima, iuser);
+					ibuf = image_get_ibuf_multilayer(ima, iuser);
 					
 			}
 			else if (ima->source == IMA_SRC_GENERATED) {
 				/* generated is: ibuf is allocated dynamically */
 				/* UV testgrid or black or solid etc */
-				if (ima->gen_x==0) ima->gen_x= 1024;
-				if (ima->gen_y==0) ima->gen_y= 1024;
-				ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, (ima->gen_flag & IMA_GEN_FLOAT) != 0, ima->gen_type, color);
+				if (ima->gen_x == 0) ima->gen_x = 1024;
+				if (ima->gen_y == 0) ima->gen_y = 1024;
+				ibuf = add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, (ima->gen_flag & IMA_GEN_FLOAT) != 0, ima->gen_type, color);
 				image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
-				ima->ok= IMA_OK_LOADED;
+				ima->ok = IMA_OK_LOADED;
 			}
 			else if (ima->source == IMA_SRC_VIEWER) {
-				if (ima->type==IMA_TYPE_R_RESULT) {
+				if (ima->type == IMA_TYPE_R_RESULT) {
 					/* always verify entirely, and potentially
 					 * returns pointer to release later */
-					ibuf= image_get_render_result(ima, iuser, lock_r);
+					ibuf = image_get_render_result(ima, iuser, lock_r);
 				}
-				else if (ima->type==IMA_TYPE_COMPOSITE) {
+				else if (ima->type == IMA_TYPE_COMPOSITE) {
 					/* requires lock/unlock, otherwise don't return image */
 					if (lock_r) {
 						/* unlock in BKE_image_release_ibuf */
 						BLI_lock_thread(LOCK_VIEWER);
-						*lock_r= ima;
+						*lock_r = ima;
 
 						/* XXX anim play for viewer nodes not yet supported */
-						frame= 0; // XXX iuser?iuser->framenr:0;
-						ibuf= image_get_ibuf(ima, 0, frame);
+						frame = 0; // XXX iuser?iuser->framenr:0;
+						ibuf = image_get_ibuf(ima, 0, frame);
 
 						if (!ibuf) {
 							/* Composite Viewer, all handled in compositor */
 							/* fake ibuf, will be filled in compositor */
-							ibuf= IMB_allocImBuf(256, 256, 32, IB_rect);
+							ibuf = IMB_allocImBuf(256, 256, 32, IB_rect);
 							image_assign_ibuf(ima, ibuf, 0, frame);
 						}
 					}
@@ -2601,38 +2600,38 @@ ImBuf *BKE_image_get_ibuf(Image *ima, ImageUser *iuser)
 
 int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
 {
-	const int len= (iuser->fie_ima*iuser->frames)/2;
+	const int len = (iuser->fie_ima * iuser->frames) / 2;
 
-	if (len==0) {
+	if (len == 0) {
 		return 0;
 	}
 	else {
 		int framenr;
-		cfra= cfra - iuser->sfra+1;
+		cfra = cfra - iuser->sfra + 1;
 
 		/* cyclic */
 		if (iuser->cycl) {
-			cfra= ((cfra) % len);
-			if (cfra < 0) cfra+= len;
-			if (cfra==0) cfra= len;
+			cfra = ((cfra) % len);
+			if (cfra < 0) cfra += len;
+			if (cfra == 0) cfra = len;
 		}
 
-		if (cfra<0) cfra= 0;
-		else if (cfra>len) cfra= len;
+		if (cfra < 0) cfra = 0;
+		else if (cfra > len) cfra = len;
 
 		/* convert current frame to current field */
-		cfra= 2*(cfra);
+		cfra = 2 * (cfra);
 		if (fieldnr) cfra++;
 
 		/* transform to images space */
-		framenr= (cfra+iuser->fie_ima-2)/iuser->fie_ima;
-		if (framenr>iuser->frames) framenr= iuser->frames;
-		framenr+= iuser->offset;
+		framenr = (cfra + iuser->fie_ima - 2) / iuser->fie_ima;
+		if (framenr > iuser->frames) framenr = iuser->frames;
+		framenr += iuser->offset;
 
 		if (iuser->cycl) {
-			framenr= ((framenr) % len);
-			while (framenr < 0) framenr+= len;
-			if (framenr==0) framenr= len;
+			framenr = ((framenr) % len);
+			while (framenr < 0) framenr += len;
+			if (framenr == 0) framenr = len;
 		}
 
 		return framenr;
@@ -2641,15 +2640,15 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
 
 void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
 {
-	const int framenr= BKE_image_user_frame_get(iuser, cfra, fieldnr);
+	const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr);
 
 	/* allows image users to handle redraws */
 	if (iuser->flag & IMA_ANIM_ALWAYS)
-		if (framenr!=iuser->framenr)
+		if (framenr != iuser->framenr)
 			iuser->flag |= IMA_ANIM_REFRESHED;
 
-	iuser->framenr= framenr;
-	if (iuser->ok==0) iuser->ok= 1;
+	iuser->framenr = framenr;
+	if (iuser->ok == 0) iuser->ok = 1;
 }
 
 int BKE_image_has_alpha(struct Image *image)
@@ -2658,8 +2657,8 @@ int BKE_image_has_alpha(struct Image *image)
 	void *lock;
 	int planes;
 	
-	ibuf= BKE_image_acquire_ibuf(image, NULL, &lock);
-	planes = (ibuf?ibuf->planes:0);
+	ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
+	planes = (ibuf ? ibuf->planes : 0);
 	BKE_image_release_ibuf(image, lock);
 
 	if (planes == 32)