cleanup: use spaces for alignment

while studying GPU lib

1 files changed, 232 insertions, 234 deletions

diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 722a7bdf114..7f3a9981a5c 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -88,7 +88,7 @@ extern Material defmaterial; /* from material.c */
 static void gpu_mcol(unsigned int ucol)
 {
 	/* mcol order is swapped */
-	const char *cp= (char *)&ucol;
+	const char *cp = (char *)&ucol;
 	glColor3ub(cp[3], cp[2], cp[1]);
 }
 
@@ -96,7 +96,7 @@ void GPU_render_text(MTFace *tface, int mode,
 	const char *textstr, int textlen, unsigned int *col,
 	float *v1, float *v2, float *v3, float *v4, int glattrib)
 {
-	if ((mode & GEMAT_TEXT) && (textlen>0) && tface->tpage) {
+	if ((mode & GEMAT_TEXT) && (textlen > 0) && tface->tpage) {
 		Image* ima = (Image *)tface->tpage;
 		ImBuf *first_ibuf;
 		const size_t textlen_st = textlen;
@@ -105,7 +105,7 @@ void GPU_render_text(MTFace *tface, int mode,
 		float advance_tab;
 		
 		/* multiline */
-		float line_start= 0.0f, line_height;
+		float line_start = 0.0f, line_height;
 		
 		if (v4)
 			line_height = max_ffff(v1[1], v2[1], v3[1], v4[2]) - min_ffff(v1[1], v2[1], v3[1], v4[2]);
@@ -128,23 +128,23 @@ void GPU_render_text(MTFace *tface, int mode,
 		matrixGlyph(first_ibuf, ' ', &centerx, &centery,
 			&sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
 		
-		advance_tab= advance * 4; /* tab width could also be an option */
+		advance_tab = advance * 4; /* tab width could also be an option */
 		
 		
 		for (index = 0; index < textlen_st; ) {
 			unsigned int character;
 			float uv[4][2];
 
-			// lets calculate offset stuff
+			/* lets calculate offset stuff */
 			character = BLI_str_utf8_as_unicode_and_size_safe(textstr + index, &index);
 			
-			if (character=='\n') {
-				glTranslatef(line_start, -line_height, 0.0);
+			if (character == '\n') {
+				glTranslatef(line_start, -line_height, 0.0f);
 				line_start = 0.0f;
 				continue;
 			}
-			else if (character=='\t') {
-				glTranslatef(advance_tab, 0.0, 0.0);
+			else if (character == '\t') {
+				glTranslatef(advance_tab, 0.0f, 0.0f);
 				line_start -= advance_tab; /* so we can go back to the start of the line */
 				continue;
 				
@@ -154,8 +154,8 @@ void GPU_render_text(MTFace *tface, int mode,
 				character = '?';
 			}
 			
-			// space starts at offset 1
-			// character = character - ' ' + 1;
+			/* space starts at offset 1 */
+			/* character = character - ' ' + 1; */
 			matrixGlyph(first_ibuf, character, & centerx, &centery,
 				&sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
 
@@ -193,7 +193,7 @@ void GPU_render_text(MTFace *tface, int mode,
 			}
 			glEnd();
 
-			glTranslatef(advance, 0.0, 0.0);
+			glTranslatef(advance, 0.0f, 0.0f);
 			line_start -= advance; /* so we can go back to the start of the line */
 		}
 		glPopMatrix();
@@ -246,7 +246,7 @@ static struct GPUTextureState {
 	float anisotropic;
 	int gpu_mipmap;
 	MTFace *lasttface;
-} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, 0, NULL};
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.0f, 0, NULL};
 
 /* Mipmap settings */
 
@@ -353,41 +353,41 @@ static void gpu_make_repbind(Image *ima)
 	ImBuf *ibuf;
 	
 	ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);
-	if (ibuf==NULL)
+	if (ibuf == NULL)
 		return;
 
 	if (ima->repbind) {
 		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
 		MEM_freeN(ima->repbind);
-		ima->repbind= NULL;
+		ima->repbind = NULL;
 		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
 	}
 
-	ima->totbind= ima->xrep*ima->yrep;
+	ima->totbind = ima->xrep*ima->yrep;
 
 	if (ima->totbind>1)
-		ima->repbind= MEM_callocN(sizeof(int)*ima->totbind, "repbind");
+		ima->repbind = MEM_callocN(sizeof(int) * ima->totbind, "repbind");
 
 	BKE_image_release_ibuf(ima, ibuf, NULL);
 }
 
 void GPU_clear_tpage(bool force)
 {
-	if (GTS.lasttface==NULL && !force)
+	if (GTS.lasttface == NULL && !force)
 		return;
 	
-	GTS.lasttface= NULL;
-	GTS.curtile= 0;
-	GTS.curima= NULL;
-	if (GTS.curtilemode!=0) {
+	GTS.lasttface = NULL;
+	GTS.curtile = 0;
+	GTS.curima = NULL;
+	if (GTS.curtilemode != 0) {
 		glMatrixMode(GL_TEXTURE);
 		glLoadIdentity();
 		glMatrixMode(GL_MODELVIEW);
 	}
-	GTS.curtilemode= 0;
-	GTS.curtileXRep=0;
-	GTS.curtileYRep=0;
-	GTS.alphablend= -1;
+	GTS.curtilemode = 0;
+	GTS.curtileXRep = 0;
+	GTS.curtileYRep = 0;
+	GTS.alphablend = -1;
 	
 	glDisable(GL_BLEND);
 	glDisable(GL_TEXTURE_2D);
@@ -403,7 +403,7 @@ static void gpu_set_alpha_blend(GPUBlendMode alphablend)
 		glDisable(GL_ALPHA_TEST);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}
-	else if (alphablend==GPU_BLEND_ADD) {
+	else if (alphablend == GPU_BLEND_ADD) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_ONE, GL_ONE);
 		glDisable(GL_ALPHA_TEST);
@@ -429,7 +429,7 @@ static void gpu_set_alpha_blend(GPUBlendMode alphablend)
 			glAlphaFunc(GL_GREATER, U.glalphaclip);
 		}
 	}
-	else if (alphablend==GPU_BLEND_CLIP) {
+	else if (alphablend == GPU_BLEND_CLIP) {
 		glDisable(GL_BLEND); 
 		glEnable(GL_ALPHA_TEST);
 		glAlphaFunc(GL_GREATER, 0.5f);
@@ -443,7 +443,7 @@ static void gpu_verify_alpha_blend(int alphablend)
 		return;
 
 	gpu_set_alpha_blend(alphablend);
-	GTS.alphablend= alphablend;
+	GTS.alphablend = alphablend;
 }
 
 static void gpu_verify_reflection(Image *ima)
@@ -467,9 +467,9 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 {
 	ImBuf *ibuf = NULL;
 	unsigned int *bind = NULL;
-	int rectw, recth, tpx=0, tpy=0, y;
-	unsigned int *tilerect= NULL, *rect= NULL;
-	float *ftilerect= NULL, *frect = NULL;
+	int rectw, recth, tpx = 0, tpy = 0, y;
+	unsigned int *tilerect = NULL, *rect = NULL;
+	float *ftilerect = NULL, *frect = NULL;
 	float *srgb_frect = NULL;
 	short texwindx, texwindy, texwinsx, texwinsy;
 	/* flag to determine whether high resolution format is used */
@@ -477,15 +477,15 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 
 	/* initialize tile mode and number of repeats */
 	GTS.ima = ima;
-	GTS.tilemode= (ima && (ima->tpageflag & (IMA_TILES|IMA_TWINANIM)));
+	GTS.tilemode = (ima && (ima->tpageflag & (IMA_TILES|IMA_TWINANIM)));
 	GTS.tileXRep = 0;
 	GTS.tileYRep = 0;
 
 	/* setting current tile according to frame */
 	if (ima && (ima->tpageflag & IMA_TWINANIM))
-		GTS.tile= ima->lastframe;
+		GTS.tile = ima->lastframe;
 	else
-		GTS.tile= tftile;
+		GTS.tile = tftile;
 
 	GTS.tile = MAX2(0, GTS.tile);
 
@@ -503,26 +503,26 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 	}
 
 	/* if tiling mode or repeat changed, change texture matrix to fit */
-	if (GTS.tilemode!=GTS.curtilemode || GTS.curtileXRep!=GTS.tileXRep ||
+	if (GTS.tilemode != GTS.curtilemode || GTS.curtileXRep != GTS.tileXRep ||
 	    GTS.curtileYRep != GTS.tileYRep)
 	{
 		glMatrixMode(GL_TEXTURE);
 		glLoadIdentity();
 
 		if (ima && (ima->tpageflag & IMA_TILES))
-			glScalef(ima->xrep, ima->yrep, 1.0);
+			glScalef(ima->xrep, ima->yrep, 1.0f);
 
 		glMatrixMode(GL_MODELVIEW);
 	}
 
 	/* check if we have a valid image */
-	if (ima==NULL || ima->ok==0)
+	if (ima == NULL || ima->ok == 0)
 		return 0;
 
 	/* check if we have a valid image buffer */
-	ibuf= BKE_image_acquire_ibuf(ima, iuser, NULL);
+	ibuf = BKE_image_acquire_ibuf(ima, iuser, NULL);
 
-	if (ibuf==NULL)
+	if (ibuf == NULL)
 		return 0;
 
 	if (ibuf->rect_float) {
@@ -552,59 +552,58 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 	
 	if (GTS.tilemode) {
 		/* tiled mode */
-		if (ima->repbind==NULL) gpu_make_repbind(ima);
-		if (GTS.tile>=ima->totbind) GTS.tile= 0;
+		if (ima->repbind == NULL) gpu_make_repbind(ima);
+		if (GTS.tile >= ima->totbind) GTS.tile = 0;
 		
 		/* this happens when you change repeat buttons */
-		if (ima->repbind) bind= &ima->repbind[GTS.tile];
-		else bind= &ima->bindcode;
+		if (ima->repbind) bind = &ima->repbind[GTS.tile];
+		else bind = &ima->bindcode;
 		
-		if (*bind==0) {
+		if (*bind == 0) {
+			texwindx = ibuf->x / ima->xrep;
+			texwindy = ibuf->y / ima->yrep;
 			
-			texwindx= ibuf->x/ima->xrep;
-			texwindy= ibuf->y/ima->yrep;
-			
-			if (GTS.tile>=ima->xrep*ima->yrep)
-				GTS.tile= ima->xrep*ima->yrep-1;
+			if (GTS.tile >= ima->xrep * ima->yrep)
+				GTS.tile = ima->xrep * ima->yrep - 1;
 	
-			texwinsy= GTS.tile / ima->xrep;
-			texwinsx= GTS.tile - texwinsy*ima->xrep;
+			texwinsy = GTS.tile / ima->xrep;
+			texwinsx = GTS.tile - texwinsy * ima->xrep;
 	
-			texwinsx*= texwindx;
-			texwinsy*= texwindy;
+			texwinsx *= texwindx;
+			texwinsy *= texwindy;
 	
-			tpx= texwindx;
-			tpy= texwindy;
+			tpx = texwindx;
+			tpy = texwindy;
 
 			if (use_high_bit_depth) {
 				if (do_color_management) {
-					srgb_frect = MEM_mallocN(ibuf->x*ibuf->y*sizeof(float)*4, "floar_buf_col_cor");
+					srgb_frect = MEM_mallocN(ibuf->x * ibuf->y * sizeof(float) * 4, "floar_buf_col_cor");
 					IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float,
 						ibuf->channels, IB_PROFILE_SRGB, IB_PROFILE_LINEAR_RGB, true,
 						ibuf->x, ibuf->y, ibuf->x, ibuf->x);
 					IMB_buffer_float_unpremultiply(srgb_frect, ibuf->x, ibuf->y);
 					/* clamp buffer colors to 1.0 to avoid artifacts due to glu for hdr images */
 					IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y);
-					frect= srgb_frect + texwinsy*ibuf->x + texwinsx;
+					frect = srgb_frect + texwinsy*ibuf->x + texwinsx;
 				}
 				else
-					frect= ibuf->rect_float + texwinsy*ibuf->x + texwinsx;
+					frect = ibuf->rect_float + texwinsy*ibuf->x + texwinsx;
 			}
 			else
-				rect= ibuf->rect + texwinsy*ibuf->x + texwinsx;
+				rect = ibuf->rect + texwinsy*ibuf->x + texwinsx;
 		}
 	}
 	else {
 		/* regular image mode */
 		bind= &ima->bindcode;
 
-		if (*bind==0) {
-			tpx= ibuf->x;
-			tpy= ibuf->y;
-			rect= ibuf->rect;
+		if (*bind == 0) {
+			tpx = ibuf->x;
+			tpy = ibuf->y;
+			rect = ibuf->rect;
 			if (use_high_bit_depth) {
 				if (do_color_management) {
-					frect = srgb_frect = MEM_mallocN(ibuf->x*ibuf->y*sizeof(*srgb_frect)*4, "floar_buf_col_cor");
+					frect = srgb_frect = MEM_mallocN(ibuf->x * ibuf->y * sizeof(*srgb_frect) * 4, "floar_buf_col_cor");
 					IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float,
 							ibuf->channels, IB_PROFILE_SRGB, IB_PROFILE_LINEAR_RGB, true,
 							ibuf->x, ibuf->y, ibuf->x, ibuf->x);
@@ -613,7 +612,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 					IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y);
 				}
 				else
-					frect= ibuf->rect_float;
+					frect = ibuf->rect_float;
 			}
 		}
 	}
@@ -633,30 +632,30 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, bool compare, boo
 		if (use_high_bit_depth) {
 			float *frectrow, *ftilerectrow;
 
-			ftilerect= MEM_mallocN(rectw*recth*sizeof(*ftilerect), "tilerect");
+			ftilerect = MEM_mallocN(rectw*recth*sizeof(*ftilerect), "tilerect");
 
-			for (y=0; y<recth; y++) {
-				frectrow= &frect[y*ibuf->x];
-				ftilerectrow= &ftilerect[y*rectw];
+			for (y = 0; y < recth; y++) {
+				frectrow = &frect[y * ibuf->x];
+				ftilerectrow = &ftilerect[y * rectw];
 
-				memcpy(ftilerectrow, frectrow, tpx*sizeof(*frectrow));
+				memcpy(ftilerectrow, frectrow, tpx * sizeof(*frectrow));
 			}
 
-			frect= ftilerect;
+			frect = ftilerect;
 		}
 		else {
 			unsigned int *rectrow, *tilerectrow;
 
-			tilerect= MEM_mallocN(rectw*recth*sizeof(*tilerect), "tilerect");
+			tilerect = MEM_mallocN(rectw*recth*sizeof(*tilerect), "tilerect");
 
-			for (y=0; y<recth; y++) {
-				rectrow= &rect[y*ibuf->x];
-				tilerectrow= &tilerect[y*rectw];
+			for (y = 0; y < recth; y++) {
+				rectrow = &rect[y * ibuf->x];
+				tilerectrow = &tilerect[y * rectw];
 
-				memcpy(tilerectrow, rectrow, tpx*sizeof(*rectrow));
+				memcpy(tilerectrow, rectrow, tpx * sizeof(*rectrow));
 			}
 			
-			rect= tilerect;
+			rect = tilerect;
 		}
 	}
 
@@ -725,12 +724,12 @@ void GPU_create_gl_tex(unsigned int *bind, unsigned int *rect, float *frect, int
 
 	if (use_high_bit_depth) {
 		if (GLEW_ARB_texture_float)
-			glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA16F,  rectw, recth, 0, GL_RGBA, GL_FLOAT, frect);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, rectw, recth, 0, GL_RGBA, GL_FLOAT, frect);
 		else
-			glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA16,  rectw, recth, 0, GL_RGBA, GL_FLOAT, frect);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, rectw, recth, 0, GL_RGBA, GL_FLOAT, frect);
 	}
 	else
-		glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA,  rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect);
 
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
 
@@ -756,12 +755,12 @@ void GPU_create_gl_tex(unsigned int *bind, unsigned int *rect, float *frect, int
 				ImBuf *mip = ibuf->mipmap[i - 1];
 				if (use_high_bit_depth) {
 					if (GLEW_ARB_texture_float)
-						glTexImage2D(GL_TEXTURE_2D, i,  GL_RGBA16F,  mip->x, mip->y, 0, GL_RGBA, GL_FLOAT, mip->rect_float);
+						glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA16F, mip->x, mip->y, 0, GL_RGBA, GL_FLOAT, mip->rect_float);
 					else
-						glTexImage2D(GL_TEXTURE_2D, i,  GL_RGBA16,  mip->x, mip->y, 0, GL_RGBA, GL_FLOAT, mip->rect_float);
+						glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA16, mip->x, mip->y, 0, GL_RGBA, GL_FLOAT, mip->rect_float);
 				}
 				else {
-					glTexImage2D(GL_TEXTURE_2D, i,  GL_RGBA,  mip->x, mip->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, mip->rect);
+					glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, mip->x, mip->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, mip->rect);
 				}
 			}
 		}
@@ -825,7 +824,7 @@ bool GPU_upload_dxt_texture(ImBuf *ibuf)
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, GPU_get_anisotropic());
 
 	blocksize = (ibuf->dds_data.fourcc == FOURCC_DXT1) ? 8 : 16;
-	for (i=0; i<ibuf->dds_data.nummipmaps && (width||height); ++i) {
+	for (i = 0; i < ibuf->dds_data.nummipmaps && (width||height); ++i) {
 		if (width == 0)
 			width = 1;
 		if (height == 0)
@@ -842,7 +841,7 @@ bool GPU_upload_dxt_texture(ImBuf *ibuf)
 	}
 
 	/* set number of mipmap levels we have, needed in case they don't go down to 1x1 */
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, i-1);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, i - 1);
 
 	return true;
 #else
@@ -888,21 +887,21 @@ int GPU_set_tpage(MTFace *tface, int mipmap, int alphablend)
 	Image *ima;
 	
 	/* check if we need to clear the state */
-	if (tface==NULL) {
+	if (tface == NULL) {
 		GPU_clear_tpage(false);
 		return 0;
 	}
 
-	ima= tface->tpage;
-	GTS.lasttface= tface;
+	ima = tface->tpage;
+	GTS.lasttface = tface;
 
 	gpu_verify_alpha_blend(alphablend);
 	gpu_verify_reflection(ima);
 
 	if (GPU_verify_image(ima, NULL, tface->tile, 1, mipmap, false)) {
-		GTS.curtile= GTS.tile;
-		GTS.curima= GTS.ima;
-		GTS.curtilemode= GTS.tilemode;
+		GTS.curtile = GTS.tile;
+		GTS.curima = GTS.ima;
+		GTS.curtilemode = GTS.tilemode;
 		GTS.curtileXRep = GTS.tileXRep;
 		GTS.curtileYRep = GTS.tileYRep;
 
@@ -911,9 +910,9 @@ int GPU_set_tpage(MTFace *tface, int mipmap, int alphablend)
 	else {
 		glDisable(GL_TEXTURE_2D);
 		
-		GTS.curtile= 0;
-		GTS.curima= NULL;
-		GTS.curtilemode= 0;
+		GTS.curtile = 0;
+		GTS.curima = NULL;
+		GTS.curtilemode = 0;
 		GTS.curtileXRep = 0;
 		GTS.curtileYRep = 0;
 
@@ -934,7 +933,7 @@ int GPU_set_tpage(MTFace *tface, int mipmap, int alphablend)
  * re-uploaded to OpenGL */
 void GPU_paint_set_mipmap(int mipmap)
 {
-	Image* ima;
+	Image *ima;
 	
 	if (!GTS.domipmap)
 		return;
@@ -942,7 +941,7 @@ void GPU_paint_set_mipmap(int mipmap)
 	GTS.texpaint = !mipmap;
 
 	if (mipmap) {
-		for (ima=G.main->image.first; ima; ima=ima->id.next) {
+		for (ima = G.main->image.first; ima; ima = ima->id.next) {
 			if (ima->bindcode) {
 				if (ima->tpageflag & IMA_MIPMAP_COMPLETE) {
 					glBindTexture(GL_TEXTURE_2D, ima->bindcode);
@@ -958,7 +957,7 @@ void GPU_paint_set_mipmap(int mipmap)
 
 	}
 	else {
-		for (ima=G.main->image.first; ima; ima=ima->id.next) {
+		for (ima = G.main->image.first; ima; ima = ima->id.next) {
 			if (ima->bindcode) {
 				glBindTexture(GL_TEXTURE_2D, ima->bindcode);
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -1071,8 +1070,7 @@ void GPU_paint_update_image(Image *ima, int x, int y, int w, int h)
 			}
 
 			glBindTexture(GL_TEXTURE_2D, ima->bindcode);
-			glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_RGBA,
-					GL_FLOAT, buffer);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_RGBA, GL_FLOAT, buffer);
 
 			MEM_freeN(buffer);
 
@@ -1127,16 +1125,16 @@ void GPU_update_images_framechange(void)
 {
 	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 (ima->tpageflag & IMA_TWINANIM) {
-			if (ima->twend >= ima->xrep*ima->yrep)
-				ima->twend= ima->xrep*ima->yrep-1;
+			if (ima->twend >= ima->xrep * ima->yrep)
+				ima->twend = ima->xrep * ima->yrep - 1;
 		
 			/* check: is bindcode not in the array? free. (to do) */
 			
 			ima->lastframe++;
 			if (ima->lastframe > ima->twend)
-				ima->lastframe= ima->twsta;
+				ima->lastframe = ima->twsta;
 		}
 	}
 }
@@ -1144,33 +1142,33 @@ void GPU_update_images_framechange(void)
 int GPU_update_image_time(Image *ima, double time)
 {
 	int	inc = 0;
-	float	diff;
+	float diff;
 	int	newframe;
 
 	if (!ima)
 		return 0;
 
-	if (ima->lastupdate<0)
+	if (ima->lastupdate < 0)
 		ima->lastupdate = 0;
 
 	if (ima->lastupdate > (float)time)
-		ima->lastupdate=(float)time;
+		ima->lastupdate = (float)time;
 
 	if (ima->tpageflag & IMA_TWINANIM) {
-		if (ima->twend >= ima->xrep*ima->yrep) ima->twend= ima->xrep*ima->yrep-1;
+		if (ima->twend >= ima->xrep * ima->yrep) ima->twend = ima->xrep * ima->yrep - 1;
 		
 		/* check: is the bindcode not in the array? Then free. (still to do) */
 		
 		diff = (float)((float)time - ima->lastupdate);
-		inc = (int)(diff*(float)ima->animspeed);
+		inc = (int)(diff * (float)ima->animspeed);
 
-		ima->lastupdate+=((float)inc/(float)ima->animspeed);
+		ima->lastupdate += ((float)inc / (float)ima->animspeed);
 
-		newframe = ima->lastframe+inc;
+		newframe = ima->lastframe + inc;
 
 		if (newframe > (int)ima->twend) {
-			if (ima->twend-ima->twsta != 0)
-				newframe = (int)ima->twsta-1 + (newframe-ima->twend)%(ima->twend-ima->twsta);
+			if (ima->twend - ima->twsta != 0)
+				newframe = (int)ima->twsta - 1 + (newframe - ima->twend) % (ima->twend - ima->twsta);
 			else
 				newframe = ima->twsta;
 		}
@@ -1207,7 +1205,7 @@ void GPU_create_smoke(SmokeModifierData *smd, int highres)
 		if (!sds->tex && !highres) {
 			/* rgba texture for color + density */
 			if (smoke_has_colors(sds->fluid)) {
-				float *data = MEM_callocN(sizeof(float)*sds->total_cells*4, "smokeColorTexture");
+				float *data = MEM_callocN(sizeof(float) * sds->total_cells * 4, "smokeColorTexture");
 				smoke_get_rgba(sds->fluid, data, 0);
 				sds->tex = GPU_texture_create_3D(sds->res[0], sds->res[1], sds->res[2], 4, data);
 				MEM_freeN(data);
@@ -1221,7 +1219,7 @@ void GPU_create_smoke(SmokeModifierData *smd, int highres)
 		else if (!sds->tex && highres) {
 			/* rgba texture for color + density */
 			if (smoke_turbulence_has_colors(sds->wt)) {
-				float *data = MEM_callocN(sizeof(float)*smoke_turbulence_get_cells(sds->wt)*4, "smokeColorTexture");
+				float *data = MEM_callocN(sizeof(float) * smoke_turbulence_get_cells(sds->wt) * 4, "smokeColorTexture");
 				smoke_turbulence_get_rgba(sds->wt, data, 0);
 				sds->tex = GPU_texture_create_3D(sds->res_wt[0], sds->res_wt[1], sds->res_wt[2], 4, data);
 				MEM_freeN(data);
@@ -1237,9 +1235,9 @@ void GPU_create_smoke(SmokeModifierData *smd, int highres)
 	}
 #else // WITH_SMOKE
 	(void)highres;
-	smd->domain->tex= NULL;
-	smd->domain->tex_flame= NULL;
-	smd->domain->tex_shadow= NULL;
+	smd->domain->tex = NULL;
+	smd->domain->tex_flame = NULL;
+	smd->domain->tex_shadow = NULL;
 #endif // WITH_SMOKE
 }
 
@@ -1263,7 +1261,7 @@ void GPU_free_unused_buffers(void)
 	BLI_lock_thread(LOCK_OPENGL);
 
 	/* images */
-	for (node=image_free_queue; node; node=node->next) {
+	for (node = image_free_queue; node; node = node->next) {
 		ima = node->link;
 
 		/* check in case it was freed in the meantime */
@@ -1290,13 +1288,13 @@ void GPU_free_image(Image *ima)
 	/* free regular image binding */
 	if (ima->bindcode) {
 		glDeleteTextures(1, (GLuint *)&ima->bindcode);
-		ima->bindcode= 0;
+		ima->bindcode = 0;
 	}
 
 	/* free glsl image binding */
 	if (ima->gputexture) {
 		GPU_texture_free(ima->gputexture);
-		ima->gputexture= NULL;
+		ima->gputexture = NULL;
 	}
 
 	/* free repeated image binding */
@@ -1304,7 +1302,7 @@ void GPU_free_image(Image *ima)
 		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
 	
 		MEM_freeN(ima->repbind);
-		ima->repbind= NULL;
+		ima->repbind = NULL;
 	}
 
 	ima->tpageflag &= ~(IMA_MIPMAP_COMPLETE|IMA_GLBIND_IS_DATA);
@@ -1312,20 +1310,20 @@ void GPU_free_image(Image *ima)
 
 void GPU_free_images(void)
 {
-	Image* ima;
+	Image *ima;
 
 	if (G.main)
-		for (ima=G.main->image.first; ima; ima=ima->id.next)
+		for (ima = G.main->image.first; ima; ima = ima->id.next)
 			GPU_free_image(ima);
 }
 
 /* same as above but only free animated images */
 void GPU_free_images_anim(void)
 {
-	Image* ima;
+	Image *ima;
 
 	if (G.main)
-		for (ima=G.main->image.first; ima; ima=ima->id.next)
+		for (ima = G.main->image.first; ima; ima = ima->id.next)
 			if (BKE_image_is_animated(ima))
 				GPU_free_image(ima);
 }
@@ -1371,7 +1369,7 @@ void GPU_free_images_old(void)
 
 /* OpenGL Materials */
 
-#define FIXEDMAT	8
+#define FIXEDMAT 8
 
 /* OpenGL state caching for materials */
 
@@ -1414,21 +1412,21 @@ static void gpu_material_to_fixed(GPUMaterialFixed *smat, const Material *bmat,
 {
 	if (bmat->mode & MA_SHLESS) {
 		copy_v3_v3(smat->diff, &bmat->r);
-		smat->diff[3]= 1.0;
+		smat->diff[3] = 1.0;
 
 		if (gamma)
 			linearrgb_to_srgb_v3_v3(smat->diff, smat->diff);
 
 		zero_v4(smat->spec);
-		smat->hard= 0;
+		smat->hard = 0;
 	}
 	else if (new_shading_nodes) {
 		copy_v3_v3(smat->diff, &bmat->r);
-		smat->diff[3]= 1.0;
+		smat->diff[3] = 1.0;
 		
 		copy_v3_v3(smat->spec, &bmat->specr);
 		smat->spec[3] = 1.0;
-		smat->hard= CLAMPIS(bmat->har, 0, 128);
+		smat->hard = CLAMPIS(bmat->har, 0, 128);
 		
 		if (dimdown) {
 			mul_v3_fl(smat->diff, 0.8f);
@@ -1442,13 +1440,13 @@ static void gpu_material_to_fixed(GPUMaterialFixed *smat, const Material *bmat,
 	}
 	else {
 		mul_v3_v3fl(smat->diff, &bmat->r, bmat->ref + bmat->emit);
-		smat->diff[3]= 1.0; /* caller may set this to bmat->alpha */
+		smat->diff[3] = 1.0; /* caller may set this to bmat->alpha */
 
 		if (bmat->shade_flag & MA_OBCOLOR)
 			mul_v3_v3(smat->diff, ob->col);
 		
 		mul_v3_v3fl(smat->spec, &bmat->specr, bmat->spec);
-		smat->spec[3]= 1.0; /* always 1 */
+		smat->spec[3] = 1.0; /* always 1 */
 		smat->hard= CLAMPIS(bmat->har, 0, 128);
 
 		if (gamma) {
@@ -1500,10 +1498,10 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 	GMS.gob = ob;
 	GMS.gscene = scene;
 	GMS.totmat = use_matcap ? 1 : ob->totcol + 1;  /* materials start from 1, default material is 0 */
-	GMS.glay= (v3d->localvd)? v3d->localvd->lay: v3d->lay; /* keep lamps visible in local view */
+	GMS.glay = (v3d->localvd)? v3d->localvd->lay: v3d->lay; /* keep lamps visible in local view */
 	GMS.gscenelock = (v3d->scenelock != 0);
-	GMS.gviewmat= rv3d->viewmat;
-	GMS.gviewinv= rv3d->viewinv;
+	GMS.gviewmat = rv3d->viewmat;
+	GMS.gviewinv = rv3d->viewinv;
 	GMS.gviewcamtexcofac = rv3d->viewcamtexcofac;
 
 	/* alpha pass setup. there's various cases to handle here:
@@ -1517,14 +1515,14 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 		*do_alpha_after = false;
 	
 	if (GMS.totmat > FIXEDMAT) {
-		GMS.matbuf= MEM_callocN(sizeof(GPUMaterialFixed)*GMS.totmat, "GMS.matbuf");
-		GMS.gmatbuf= MEM_callocN(sizeof(*GMS.gmatbuf)*GMS.totmat, "GMS.matbuf");
-		GMS.alphablend= MEM_callocN(sizeof(*GMS.alphablend)*GMS.totmat, "GMS.matbuf");
+		GMS.matbuf = MEM_callocN(sizeof(GPUMaterialFixed) * GMS.totmat, "GMS.matbuf");
+		GMS.gmatbuf = MEM_callocN(sizeof(*GMS.gmatbuf) * GMS.totmat, "GMS.matbuf");
+		GMS.alphablend = MEM_callocN(sizeof(*GMS.alphablend) * GMS.totmat, "GMS.matbuf");
 	}
 	else {
-		GMS.matbuf= GMS.matbuf_fixed;
-		GMS.gmatbuf= GMS.gmatbuf_fixed;
-		GMS.alphablend= GMS.alphablend_fixed;
+		GMS.matbuf = GMS.matbuf_fixed;
+		GMS.gmatbuf = GMS.gmatbuf_fixed;
+		GMS.alphablend = GMS.alphablend_fixed;
 	}
 
 	/* viewport material, setup in space_view3d, defaults to matcap using ma->preview now */
@@ -1535,38 +1533,38 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 		/* do material 1 too, for displists! */
 		memcpy(&GMS.matbuf[1], &GMS.matbuf[0], sizeof(GPUMaterialFixed));
 	
-		GMS.alphablend[0]= GPU_BLEND_SOLID;
+		GMS.alphablend[0] = GPU_BLEND_SOLID;
 	}
 	else {
 	
 		/* no materials assigned? */
-		if (ob->totcol==0) {
+		if (ob->totcol == 0) {
 			gpu_material_to_fixed(&GMS.matbuf[0], &defmaterial, 0, ob, new_shading_nodes, true);
 
 			/* do material 1 too, for displists! */
 			memcpy(&GMS.matbuf[1], &GMS.matbuf[0], sizeof(GPUMaterialFixed));
 
 			if (glsl) {
-				GMS.gmatbuf[0]= &defmaterial;
+				GMS.gmatbuf[0] = &defmaterial;
 				GPU_material_from_blender(GMS.gscene, &defmaterial);
 			}
 
-			GMS.alphablend[0]= GPU_BLEND_SOLID;
+			GMS.alphablend[0] = GPU_BLEND_SOLID;
 		}
 		
 		/* setup materials */
-		for (a=1; a<=ob->totcol; a++) {
+		for (a = 1; a <= ob->totcol; a++) {
 			/* find a suitable material */
-			ma= give_current_material(ob, a);
-			if (!glsl && !new_shading_nodes) ma= gpu_active_node_material(ma);
-			if (ma==NULL) ma= &defmaterial;
+			ma = give_current_material(ob, a);
+			if (!glsl && !new_shading_nodes) ma = gpu_active_node_material(ma);
+			if (ma == NULL) ma = &defmaterial;
 
 			/* create glsl material if requested */
-			gpumat = (glsl)? GPU_material_from_blender(GMS.gscene, ma): NULL;
+			gpumat = glsl? GPU_material_from_blender(GMS.gscene, ma): NULL;
 
 			if (gpumat) {
 				/* do glsl only if creating it succeed, else fallback */
-				GMS.gmatbuf[a]= ma;
+				GMS.gmatbuf[a] = ma;
 				alphablend = GPU_material_alpha_blend(gpumat, ob->col);
 			}
 			else {
@@ -1574,11 +1572,11 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 				gpu_material_to_fixed(&GMS.matbuf[a], ma, gamma, ob, new_shading_nodes, false);
 
 				if (GMS.use_alpha_pass && ((ma->mode & MA_TRANSP) || (new_shading_nodes && ma->alpha != 1.0f))) {
-					GMS.matbuf[a].diff[3]= ma->alpha;
+					GMS.matbuf[a].diff[3] = ma->alpha;
 					alphablend = (ma->alpha == 1.0f)? GPU_BLEND_SOLID: GPU_BLEND_ALPHA;
 				}
 				else {
-					GMS.matbuf[a].diff[3]= 1.0f;
+					GMS.matbuf[a].diff[3] = 1.0f;
 					alphablend = GPU_BLEND_SOLID;
 				}
 			}
@@ -1589,10 +1587,10 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 				if (ELEM(alphablend, GPU_BLEND_ALPHA, GPU_BLEND_ADD, GPU_BLEND_ALPHA_SORT))
 					*do_alpha_after = true;
 
-			GMS.alphablend[a]= alphablend;
+			GMS.alphablend[a] = alphablend;
 		}
 	}
-	
+
 	/* let's start with a clean state */
 	GPU_disable_material();
 }
@@ -1610,10 +1608,10 @@ int GPU_enable_material(int nr, void *attribs)
 		memset(&GMS, 0, sizeof(GMS));
 
 		mul_v3_v3fl(diff, &defmaterial.r, defmaterial.ref + defmaterial.emit);
-		diff[3]= 1.0;
+		diff[3] = 1.0;
 
 		mul_v3_v3fl(spec, &defmaterial.specr, defmaterial.spec);
-		spec[3]= 1.0;
+		spec[3] = 1.0;
 
 		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diff);
 		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, spec);
@@ -1623,21 +1621,21 @@ int GPU_enable_material(int nr, void *attribs)
 	}
 
 	/* prevent index to use un-initialized array items */
-	if (nr>=GMS.totmat)
-		nr= 0;
+	if (nr >= GMS.totmat)
+		nr = 0;
 
 	if (gattribs)
 		memset(gattribs, 0, sizeof(*gattribs));
 
 	/* keep current material */
-	if (nr==GMS.lastmatnr)
+	if (nr == GMS.lastmatnr)
 		return GMS.lastretval;
 
 	/* unbind glsl material */
 	if (GMS.gboundmat) {
 		if (GMS.is_alpha_pass) glDepthMask(0);
 		GPU_material_unbind(GPU_material_from_blender(GMS.gscene, GMS.gboundmat));
-		GMS.gboundmat= NULL;
+		GMS.gboundmat = NULL;
 	}
 
 	/* draw materials with alpha in alpha pass */
@@ -1667,7 +1665,7 @@ int GPU_enable_material(int nr, void *attribs)
 
 			auto_bump_scale = GMS.gob->derivedFinal != NULL ? GMS.gob->derivedFinal->auto_bump_scale : 1.0f;
 			GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, GMS.gob->col, auto_bump_scale);
-			GMS.gboundmat= mat;
+			GMS.gboundmat = mat;
 
 			/* for glsl use alpha blend mode, unless it's set to solid and
 			 * we are already drawing in an alpha pass */
@@ -1684,7 +1682,7 @@ int GPU_enable_material(int nr, void *attribs)
 			}
 
 			if (GMS.use_matcaps)
-				glColor3f(1.0, 1.0, 1.0f);
+				glColor3f(1.0f, 1.0f, 1.0f);
 		}
 		else {
 			/* or do fixed function opengl material */
@@ -1716,8 +1714,8 @@ int GPU_get_material_alpha_blend(void)
 
 void GPU_disable_material(void)
 {
-	GMS.lastmatnr= -1;
-	GMS.lastretval= 1;
+	GMS.lastmatnr = -1;
+	GMS.lastretval = 1;
 
 	if (GMS.gboundmat) {
 		if (GMS.backface_culling)
@@ -1725,7 +1723,7 @@ void GPU_disable_material(void)
 
 		if (GMS.is_alpha_pass) glDepthMask(0);
 		GPU_material_unbind(GPU_material_from_blender(GMS.gscene, GMS.gboundmat));
-		GMS.gboundmat= NULL;
+		GMS.gboundmat = NULL;
 	}
 
 	GPU_set_material_alpha_blend(GPU_BLEND_SOLID);
@@ -1762,9 +1760,9 @@ void GPU_end_object_materials(void)
 		MEM_freeN(GMS.alphablend);
 	}
 
-	GMS.matbuf= NULL;
-	GMS.gmatbuf= NULL;
-	GMS.alphablend= NULL;
+	GMS.matbuf = NULL;
+	GMS.gmatbuf = NULL;
+	GMS.alphablend = NULL;
 
 	/* resetting the texture matrix after the scaling needed for tiled textures */
 	if (GTS.tilemode) {
@@ -1782,57 +1780,57 @@ int GPU_default_lights(void)
 	int a, count = 0;
 	
 	/* initialize */
-	if (U.light[0].flag==0 && U.light[1].flag==0 && U.light[2].flag==0) {
-		U.light[0].flag= 1;
-		U.light[0].vec[0]= -0.3; U.light[0].vec[1]= 0.3; U.light[0].vec[2]= 0.9;
-		U.light[0].col[0]= 0.8; U.light[0].col[1]= 0.8; U.light[0].col[2]= 0.8;
-		U.light[0].spec[0]= 0.5; U.light[0].spec[1]= 0.5; U.light[0].spec[2]= 0.5;
-		U.light[0].spec[3]= 1.0;
+	if (U.light[0].flag == 0 && U.light[1].flag == 0 && U.light[2].flag == 0) {
+		U.light[0].flag = 1;
+		U.light[0].vec[0] = -0.3; U.light[0].vec[1] = 0.3; U.light[0].vec[2] = 0.9;
+		U.light[0].col[0] = 0.8; U.light[0].col[1] = 0.8; U.light[0].col[2] = 0.8;
+		U.light[0].spec[0] = 0.5; U.light[0].spec[1] = 0.5; U.light[0].spec[2] = 0.5;
+		U.light[0].spec[3] = 1.0;
 		
-		U.light[1].flag= 0;
-		U.light[1].vec[0]= 0.5; U.light[1].vec[1]= 0.5; U.light[1].vec[2]= 0.1;
-		U.light[1].col[0]= 0.4; U.light[1].col[1]= 0.4; U.light[1].col[2]= 0.8;
-		U.light[1].spec[0]= 0.3; U.light[1].spec[1]= 0.3; U.light[1].spec[2]= 0.5;
-		U.light[1].spec[3]= 1.0;
+		U.light[1].flag = 0;
+		U.light[1].vec[0] = 0.5; U.light[1].vec[1] = 0.5; U.light[1].vec[2] = 0.1;
+		U.light[1].col[0] = 0.4; U.light[1].col[1] = 0.4; U.light[1].col[2] = 0.8;
+		U.light[1].spec[0] = 0.3; U.light[1].spec[1] = 0.3; U.light[1].spec[2] = 0.5;
+		U.light[1].spec[3] = 1.0;
 	
-		U.light[2].flag= 0;
-		U.light[2].vec[0]= 0.3; U.light[2].vec[1]= -0.3; U.light[2].vec[2]= -0.2;
-		U.light[2].col[0]= 0.8; U.light[2].col[1]= 0.5; U.light[2].col[2]= 0.4;
-		U.light[2].spec[0]= 0.5; U.light[2].spec[1]= 0.4; U.light[2].spec[2]= 0.3;
-		U.light[2].spec[3]= 1.0;
+		U.light[2].flag = 0;
+		U.light[2].vec[0] = 0.3; U.light[2].vec[1] = -0.3; U.light[2].vec[2] = -0.2;
+		U.light[2].col[0] = 0.8; U.light[2].col[1] = 0.5; U.light[2].col[2] = 0.4;
+		U.light[2].spec[0] = 0.5; U.light[2].spec[1] = 0.4; U.light[2].spec[2] = 0.3;
+		U.light[2].spec[3] = 1.0;
 	}
 
 	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
 
-	for (a=0; a<8; a++) {
-		if (a<3) {
+	for (a = 0; a < 8; a++) {
+		if (a < 3) {
 			if (U.light[a].flag) {
-				glEnable(GL_LIGHT0+a);
+				glEnable(GL_LIGHT0 + a);
 
 				normalize_v3_v3(position, U.light[a].vec);
-				position[3]= 0.0f;
+				position[3] = 0.0f;
 				
-				glLightfv(GL_LIGHT0+a, GL_POSITION, position); 
-				glLightfv(GL_LIGHT0+a, GL_DIFFUSE, U.light[a].col); 
-				glLightfv(GL_LIGHT0+a, GL_SPECULAR, U.light[a].spec); 
+				glLightfv(GL_LIGHT0 + a, GL_POSITION, position); 
+				glLightfv(GL_LIGHT0 + a, GL_DIFFUSE, U.light[a].col); 
+				glLightfv(GL_LIGHT0 + a, GL_SPECULAR, U.light[a].spec); 
 
 				count++;
 			}
 			else {
-				glDisable(GL_LIGHT0+a);
+				glDisable(GL_LIGHT0 + a);
 
-				glLightfv(GL_LIGHT0+a, GL_POSITION, zero); 
-				glLightfv(GL_LIGHT0+a, GL_DIFFUSE, zero); 
-				glLightfv(GL_LIGHT0+a, GL_SPECULAR, zero);
+				glLightfv(GL_LIGHT0 + a, GL_POSITION, zero); 
+				glLightfv(GL_LIGHT0 + a, GL_DIFFUSE, zero); 
+				glLightfv(GL_LIGHT0 + a, GL_SPECULAR, zero);
 			}
 
-			// clear stuff from other opengl lamp usage
-			glLightf(GL_LIGHT0+a, GL_SPOT_CUTOFF, 180.0);
-			glLightf(GL_LIGHT0+a, GL_CONSTANT_ATTENUATION, 1.0);
-			glLightf(GL_LIGHT0+a, GL_LINEAR_ATTENUATION, 0.0);
+			/* clear stuff from other opengl lamp usage */
+			glLightf(GL_LIGHT0 + a, GL_SPOT_CUTOFF, 180.0);
+			glLightf(GL_LIGHT0 + a, GL_CONSTANT_ATTENUATION, 1.0);
+			glLightf(GL_LIGHT0 + a, GL_LINEAR_ATTENUATION, 0.0);
 		}
 		else
-			glDisable(GL_LIGHT0+a);
+			glDisable(GL_LIGHT0 + a);
 	}
 	
 	glDisable(GL_LIGHTING);
@@ -1850,68 +1848,68 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[4][
 	float position[4], direction[4], energy[4];
 	
 	/* disable all lights */
-	for (count=0; count<8; count++)
-		glDisable(GL_LIGHT0+count);
+	for (count = 0; count < 8; count++)
+		glDisable(GL_LIGHT0 + count);
 	
-	/* view direction for specular is not compute correct by default in
+	/* view direction for specular is not computed correct by default in
 	 * opengl, so we set the settings ourselfs */
-	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, (ortho)? GL_FALSE: GL_TRUE);
+	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, ortho ? GL_FALSE : GL_TRUE);
 
-	count= 0;
-	
-	for (base=scene->base.first; base; base=base->next) {
-		if (base->object->type!=OB_LAMP)
+	count = 0;
+
+	for (base = scene->base.first; base; base = base->next) {
+		if (base->object->type != OB_LAMP)
 			continue;
 
 		if (!(base->lay & lay) || !(base->lay & ob->lay))
 			continue;
 
-		la= base->object->data;
+		la = base->object->data;
 		
 		/* setup lamp transform */
 		glPushMatrix();
 		glLoadMatrixf((float *)viewmat);
 		
-		if (la->type==LA_SUN) {
+		if (la->type == LA_SUN) {
 			/* sun lamp */
 			copy_v3_v3(direction, base->object->obmat[2]);
-			direction[3]= 0.0;
+			direction[3] = 0.0;
 
 			glLightfv(GL_LIGHT0+count, GL_POSITION, direction); 
 		}
 		else {
 			/* other lamps with attenuation */
 			copy_v3_v3(position, base->object->obmat[3]);
-			position[3]= 1.0f;
+			position[3] = 1.0f;
 
 			glLightfv(GL_LIGHT0+count, GL_POSITION, position); 
 			glLightf(GL_LIGHT0+count, GL_CONSTANT_ATTENUATION, 1.0);
-			glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, la->att1/la->dist);
-			glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, la->att2/(la->dist*la->dist));
+			glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, la->att1 / la->dist);
+			glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, la->att2 / (la->dist * la->dist));
 			
-			if (la->type==LA_SPOT) {
+			if (la->type == LA_SPOT) {
 				/* spot lamp */
 				negate_v3_v3(direction, base->object->obmat[2]);
-				glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, direction);
-				glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, RAD2DEGF(la->spotsize * 0.5f));
-				glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0f*la->spotblend);
+				glLightfv(GL_LIGHT0 + count, GL_SPOT_DIRECTION, direction);
+				glLightf(GL_LIGHT0 + count, GL_SPOT_CUTOFF, RAD2DEGF(la->spotsize * 0.5f));
+				glLightf(GL_LIGHT0 + count, GL_SPOT_EXPONENT, 128.0f * la->spotblend);
 			}
 			else
-				glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0);
+				glLightf(GL_LIGHT0 + count, GL_SPOT_CUTOFF, 180.0);
 		}
 		
 		/* setup energy */
 		mul_v3_v3fl(energy, &la->r, la->energy);
-		energy[3]= 1.0;
+		energy[3] = 1.0;
 
-		glLightfv(GL_LIGHT0+count, GL_DIFFUSE, energy); 
-		glLightfv(GL_LIGHT0+count, GL_SPECULAR, energy);
-		glEnable(GL_LIGHT0+count);
+		glLightfv(GL_LIGHT0 + count, GL_DIFFUSE, energy); 
+		glLightfv(GL_LIGHT0 + count, GL_SPECULAR, energy);
+		glEnable(GL_LIGHT0 + count);
 		
 		glPopMatrix();
 		
 		count++;
-		if (count==8)
+		if (count == 8)
 			break;
 	}
 
@@ -1957,8 +1955,8 @@ void GPU_state_init(void)
 	float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 };
 	float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 };
 	int a, x, y;
-	GLubyte pat[32*32];
-	const GLubyte *patc= pat;
+	GLubyte pat[32 * 32];
+	const GLubyte *patc = pat;
 	
 	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular);
@@ -2003,14 +2001,14 @@ void GPU_state_init(void)
 	glPixelTransferi(GL_DEPTH_SCALE, 1);
 	glDepthRange(0.0, 1.0);
 	
-	a= 0;
-	for (x=0; x<32; x++) {
-		for (y=0; y<4; y++) {
-			if ( (x) & 1) pat[a++]= 0x88;
-			else pat[a++]= 0x22;
+	a = 0;
+	for (x = 0; x < 32; x++) {
+		for (y = 0; y < 4; y++) {
+			if (x & 1) pat[a++] = 0x88;
+			else pat[a++] = 0x22;
 		}
 	}
-	
+
 	glPolygonStipple(patc);
 
 	glMatrixMode(GL_TEXTURE);