style cleanup: whitespace / commas

3 files changed, 39 insertions, 40 deletions

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 2a561a6bc6c..8a43e15eb9f 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -84,19 +84,19 @@ static void region_draw_emboss(ARegion *ar, rcti *scirct)
 	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 	
 	/* right  */
-	glColor4ub(0,0,0, 30);
+	glColor4ub(0, 0, 0, 30);
 	sdrawline(rect.xmax, rect.ymin, rect.xmax, rect.ymax);
 	
 	/* bottom  */
-	glColor4ub(0,0,0, 30);
+	glColor4ub(0, 0, 0, 30);
 	sdrawline(rect.xmin, rect.ymin, rect.xmax, rect.ymin);
 	
 	/* top  */
-	glColor4ub(255,255,255, 30);
+	glColor4ub(255, 255, 255, 30);
 	sdrawline(rect.xmin, rect.ymax, rect.xmax, rect.ymax);
 
 	/* left  */
-	glColor4ub(255,255,255, 30);
+	glColor4ub(255, 255, 255, 30);
 	sdrawline(rect.xmin, rect.ymin, rect.xmin, rect.ymax);
 	
 	glDisable( GL_BLEND );
@@ -1530,17 +1530,17 @@ int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
 
 	if (sa->flag & HEADER_NO_PULLDOWN) {
 		but = uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
-						 ICON_DISCLOSURE_TRI_RIGHT,
-						 xco,yco,UI_UNIT_X,UI_UNIT_Y-2,
-						 &(sa->flag), 0, 0, 0, 0, 
-						 "Show pulldown menus");
+		                       ICON_DISCLOSURE_TRI_RIGHT,
+		                       xco, yco, UI_UNIT_X, UI_UNIT_Y - 2,
+		                       &(sa->flag), 0, 0, 0, 0,
+		                       "Show pulldown menus");
 	}
 	else {
 		but = uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
-						 ICON_DISCLOSURE_TRI_DOWN,
-						 xco,yco,UI_UNIT_X,UI_UNIT_Y-2,
-						 &(sa->flag), 0, 0, 0, 0, 
-						 "Hide pulldown menus");
+		                       ICON_DISCLOSURE_TRI_DOWN,
+		                       xco, yco, UI_UNIT_X, UI_UNIT_Y - 2,
+		                       &(sa->flag), 0, 0, 0, 0,
+		                       "Hide pulldown menus");
 	}
 
 	uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
@@ -1803,7 +1803,7 @@ void ED_region_info_draw(ARegion *ar, const char *text, int block, float alpha)
 	rect.ymax = ar->winrct.ymax - ar->winrct.ymin;
 
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glColor4f(0.0f, 0.0f, 0.0f, alpha);
 	glRecti(rect.xmin, rect.ymin, rect.xmax+1, rect.ymax+1);
 	glDisable(GL_BLEND);
@@ -1820,7 +1820,7 @@ void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy)
 	float fac, blendfac;
 	int x1, y1, x2, y2;
 
-	/* the image is located inside (0,0),(1, 1) as set by view2d */
+	/* the image is located inside (0, 0), (1, 1) as set by view2d */
 	UI_ThemeColorShade(TH_BACK, 20);
 
 	UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x1, &y1);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 5b73645abde..50430399f09 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -81,14 +81,14 @@ GLubyte stipple_halftone[128] = {
 
 
 GLubyte stipple_quarttone[128] = { 
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0,
-	136,136,136,136,0,0,0,0,34,34,34,34,0,0,0,0};
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0,
+	136, 136, 136, 136, 0, 0, 0, 0, 34, 34, 34, 34, 0, 0, 0, 0};
 
 
 GLubyte stipple_diag_stripes_pos[128] = {
@@ -195,16 +195,15 @@ void fdrawcheckerboard(float x1, float y1, float x2, float y2)
 {
 	unsigned char col1[4]= {40, 40, 40}, col2[4]= {50, 50, 50};
 
-	GLubyte checker_stipple[32*32/8] = {
-		255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
-		255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
-		0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
-		0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
-		255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
-		255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
-		0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
-		0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
-	};
+	GLubyte checker_stipple[32 * 32 / 8] = {
+		255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0,
+		255,  0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0,
+		0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255,
+		0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255,
+		255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0,
+		255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0,
+		0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255,
+		0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255};
 	
 	glColor3ubv(col1);
 	glRectf(x1, y1, x2, y2);
@@ -370,8 +369,8 @@ void fdrawXORellipse(float xofs, float yofs, float hw, float hh)
 	set_inverted_drawing(1);
 
 	glPushMatrix();
-	glTranslatef(xofs, yofs, 0.0);
-	glScalef(1,hh/hw,1);
+	glTranslatef(xofs, yofs, 0.0f);
+	glScalef(1.0f, hh / hw, 1.0f);
 	glutil_draw_lined_arc(0.0, M_PI*2.0, hw, 20);
 	glPopMatrix();
 
@@ -786,10 +785,10 @@ void glaEnd2DDraw(gla2DDrawInfo *di)
 
 static int curmode=0;
 static int pointhack=0;
-static GLubyte Squaredot[16] = { 0xff,0xff,0xff,0xff,
-								 0xff,0xff,0xff,0xff,
-								 0xff,0xff,0xff,0xff, 
-								 0xff,0xff,0xff,0xff};
+static GLubyte Squaredot[16] = {0xff, 0xff, 0xff, 0xff,
+                                0xff, 0xff, 0xff, 0xff,
+                                0xff, 0xff, 0xff, 0xff,
+                                0xff, 0xff, 0xff, 0xff};
 
 void bglBegin(int mode)
 {
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 3777547fa90..49672b77d43 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1505,13 +1505,13 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event)
 							RNA_enum_set(op->ptr, "direction", 'h');
 							sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_H;
 							
-							WM_cursor_set(CTX_wm_window(C),CURSOR_X_MOVE);
+							WM_cursor_set(CTX_wm_window(C), CURSOR_X_MOVE);
 						}
 						else {
 							RNA_enum_set(op->ptr, "direction", 'v');
 							sd->sarea->flag |= AREA_FLAG_DRAWSPLIT_V;
 							
-							WM_cursor_set(CTX_wm_window(C),CURSOR_Y_MOVE);
+							WM_cursor_set(CTX_wm_window(C), CURSOR_Y_MOVE);
 						}
 					}
 				}