Cleanup: unnecessary comma use

4 files changed, 65 insertions, 24 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 32c9177fafe..c22055701ee 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3577,11 +3577,11 @@ static int findBitIndex(unsigned int x)
 	else {
 		int idx = 0;
 
-		if (x & 0xFFFF0000) idx += 16, x >>= 16;
-		if (x & 0xFF00) idx += 8, x >>= 8;
-		if (x & 0xF0) idx += 4, x >>= 4;
-		if (x & 0xC) idx += 2, x >>= 2;
-		if (x & 0x2) idx += 1;
+		if (x & 0xFFFF0000) { idx += 16; x >>= 16; }
+		if (x & 0xFF00)     { idx +=  8; x >>=  8; }
+		if (x & 0xF0)       { idx +=  4; x >>=  4; }
+		if (x & 0xC)        { idx +=  2; x >>=  2; }
+		if (x & 0x2)        { idx +=  1; }
 
 		return idx;
 	}
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 2daf3f7ba70..e802cf82b8e 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2264,7 +2264,6 @@ static void ui_litem_layout_radial(uiLayout *litem)
 	int itemnum = 0;
 	int totitems = 0;
 
-	int minx, miny, maxx, maxy;
 	/* For the radial layout we will use Matt Ebb's design
 	 * for radiation, see http://mattebb.com/weblog/radiation/
 	 * also the old code at http://developer.blender.org/T5103
@@ -2275,7 +2274,7 @@ static void ui_litem_layout_radial(uiLayout *litem)
 	x = litem->x;
 	y = litem->y;
 
-	minx = x, miny = y, maxx = x, maxy = y;
+	int minx = x, miny = y, maxx = x, maxy = y;
 
 	/* first count total items */
 	for (item = litem->items.first; item; item = item->next)
diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c
index 2db2137784a..04cff288b03 100644
--- a/source/blender/editors/space_text/text_autocomplete.c
+++ b/source/blender/editors/space_text/text_autocomplete.c
@@ -327,8 +327,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 				if (text_do_suggest_select(st, ar))
 					swallow = 1;
 				else {
-					if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
-					if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0;
+					if (tools & TOOL_SUGG_LIST) {
+						texttool_suggest_clear();
+					}
+					if (tools & TOOL_DOCUMENT)  {
+						texttool_docs_clear();
+						doc_scroll = 0;
+					}
 					retval = OPERATOR_FINISHED;
 				}
 				draw = 1;
@@ -342,8 +347,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 					swallow = 1;
 				}
 				else {
-					if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
-					if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0;
+					if (tools & TOOL_SUGG_LIST) {
+						texttool_suggest_clear();
+					}
+					if (tools & TOOL_DOCUMENT) {
+						texttool_docs_clear();
+						doc_scroll = 0;
+					}
 					retval = OPERATOR_FINISHED;
 				}
 				draw = 1;
@@ -352,8 +362,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 		case ESCKEY:
 			if (event->val == KM_PRESS) {
 				draw = swallow = 1;
-				if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
-				else if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0;
+				if (tools & TOOL_SUGG_LIST) {
+					texttool_suggest_clear();
+				}
+				else if (tools & TOOL_DOCUMENT) {
+					texttool_docs_clear();
+					doc_scroll = 0;
+				}
 				else draw = swallow = 0;
 				retval = OPERATOR_CANCELLED;
 			}
@@ -367,7 +382,11 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 					swallow = 1;
 					draw = 1;
 				}
-				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1;
+				if (tools & TOOL_DOCUMENT) {
+					texttool_docs_clear();
+					doc_scroll = 0;
+					draw = 1;
+				}
 				retval = OPERATOR_FINISHED;
 			}
 			break;
@@ -398,7 +417,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 						}
 					}
 				}
-				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0;
+				if (tools & TOOL_DOCUMENT) {
+					texttool_docs_clear();
+					doc_scroll = 0;
+				}
 			}
 			break;
 		case RIGHTARROWKEY:
@@ -427,7 +449,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 						}
 					}
 				}
-				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0;
+				if (tools & TOOL_DOCUMENT) {
+					texttool_docs_clear();
+					doc_scroll = 0;
+				}
 			}
 			break;
 		case PAGEDOWNKEY:
@@ -498,8 +523,15 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 			break;
 #if 0
 		default:
-			if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(), draw = 1;
-			if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1;
+			if (tools & TOOL_SUGG_LIST) {
+				texttool_suggest_clear();
+				draw = 1;
+			}
+			if (tools & TOOL_DOCUMENT) {
+				texttool_docs_clear();
+				doc_scroll = 0;
+				draw = 1;
+			}
 #endif
 	}
 
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 16087921ab6..9448f6af69f 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1108,8 +1108,13 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
 		vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
 
-		if (vcurc < 0) vcurc = 0;
-		if (vselc < 0) vselc = 0, hidden = 1;
+		if (vcurc < 0) {
+			vcurc = 0;
+		}
+		if (vselc < 0) {
+			vselc = 0;
+			hidden = 1;
+		}
 		
 		UI_ThemeColor(TH_SHADE2);
 		x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
@@ -1135,11 +1140,16 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
 			}
 
 			y -= froml * lheight;
-			glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight); y -= lheight;
-			for (i = froml + 1; i < tol; i++)
-				glRecti(x - 4, y, ar->winx, y - lheight),  y -= lheight;
 
-			glRecti(x - 4, y, x + toc * st->cwidth, y - lheight);  y -= lheight;
+			glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight);
+			y -= lheight;
+			for (i = froml + 1; i < tol; i++) {
+				glRecti(x - 4, y, ar->winx, y - lheight);
+				y -= lheight;
+			}
+
+			glRecti(x - 4, y, x + toc * st->cwidth, y - lheight);
+			y -= lheight;
 		}
 	}
 	else {