Cleanup: style, use braces for editor/spaces

1 files changed, 139 insertions, 68 deletions

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index afef027f7e1..2d25c067d69 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -120,8 +120,9 @@ static bNodeTree *node_tree_from_ID(ID *id)
 void ED_node_tag_update_id(ID *id)
 {
 	bNodeTree *ntree = node_tree_from_ID(id);
-	if (id == NULL || ntree == NULL)
+	if (id == NULL || ntree == NULL) {
 		return;
+	}
 
 	/* TODO(sergey): With the new dependency graph it
 	 * should be just enough to only tag ntree itself,
@@ -133,12 +134,15 @@ void ED_node_tag_update_id(ID *id)
 	if (ntree->type == NTREE_SHADER) {
 		DEG_id_tag_update(id, 0);
 
-		if (GS(id->name) == ID_MA)
+		if (GS(id->name) == ID_MA) {
 			WM_main_add_notifier(NC_MATERIAL | ND_SHADING, id);
-		else if (GS(id->name) == ID_LA)
+		}
+		else if (GS(id->name) == ID_LA) {
 			WM_main_add_notifier(NC_LAMP | ND_LIGHTING, id);
-		else if (GS(id->name) == ID_WO)
+		}
+		else if (GS(id->name) == ID_WO) {
 			WM_main_add_notifier(NC_WORLD | ND_WORLD, id);
+		}
 	}
 	else if (ntree->type == NTREE_COMPOSIT) {
 		WM_main_add_notifier(NC_SCENE | ND_NODES, id);
@@ -155,8 +159,9 @@ void ED_node_tag_update_id(ID *id)
 
 void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree, bNode *node)
 {
-	if (!ntree)
+	if (!ntree) {
 		return;
+	}
 
 	bool do_tag_update = true;
 	if (node != NULL) {
@@ -169,13 +174,15 @@ void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree, bNode *node)
 	if (do_tag_update) {
 		FOREACH_NODETREE_BEGIN(bmain, tntree, id) {
 			/* check if nodetree uses the group */
-			if (ntreeHasTree(tntree, ntree))
+			if (ntreeHasTree(tntree, ntree)) {
 				ED_node_tag_update_id(id);
+			}
 		} FOREACH_NODETREE_END;
 	}
 
-	if (ntree->type == NTREE_TEXTURE)
+	if (ntree->type == NTREE_TEXTURE) {
 		ntreeTexCheckCyclics(ntree);
+	}
 }
 
 static bool compare_nodes(const bNode *a, const bNode *b)
@@ -192,36 +199,46 @@ static bool compare_nodes(const bNode *a, const bNode *b)
 	 * this is O(n^2) worst case */
 	for (parent = a->parent; parent; parent = parent->parent) {
 		/* if b is an ancestor, it is always behind a */
-		if (parent == b)
+		if (parent == b) {
 			return 1;
+		}
 		/* any selected ancestor moves the node forward */
-		if (parent->flag & NODE_ACTIVE)
+		if (parent->flag & NODE_ACTIVE) {
 			a_active = 1;
-		if (parent->flag & NODE_SELECT)
+		}
+		if (parent->flag & NODE_SELECT) {
 			a_select = 1;
+		}
 	}
 	for (parent = b->parent; parent; parent = parent->parent) {
 		/* if a is an ancestor, it is always behind b */
-		if (parent == a)
+		if (parent == a) {
 			return 0;
+		}
 		/* any selected ancestor moves the node forward */
-		if (parent->flag & NODE_ACTIVE)
+		if (parent->flag & NODE_ACTIVE) {
 			b_active = 1;
-		if (parent->flag & NODE_SELECT)
+		}
+		if (parent->flag & NODE_SELECT) {
 			b_select = 1;
+		}
 	}
 
 	/* if one of the nodes is in the background and the other not */
-	if ((a->flag & NODE_BACKGROUND) && !(b->flag & NODE_BACKGROUND))
+	if ((a->flag & NODE_BACKGROUND) && !(b->flag & NODE_BACKGROUND)) {
 		return 0;
-	else if (!(a->flag & NODE_BACKGROUND) && (b->flag & NODE_BACKGROUND))
+	}
+	else if (!(a->flag & NODE_BACKGROUND) && (b->flag & NODE_BACKGROUND)) {
 		return 1;
+	}
 
 	/* if one has a higher selection state (active > selected > nothing) */
-	if (!b_active && a_active)
+	if (!b_active && a_active) {
 		return 1;
-	else if (!b_select && (a_active || a_select))
+	}
+	else if (!b_select && (a_active || a_select)) {
 		return 1;
+	}
 
 	return 0;
 }
@@ -246,8 +263,9 @@ void ED_node_sort(bNodeTree *ntree)
 				first_b = first_b->next;
 			}
 			/* all batches merged? */
-			if (first_b == NULL)
+			if (first_b == NULL) {
 				break;
+			}
 
 			/* merge batches */
 			node_a = first_a;
@@ -271,8 +289,9 @@ void ED_node_sort(bNodeTree *ntree)
 			first_b = node_b;
 			for (; b < k; ++b) {
 				/* all nodes sorted? */
-				if (first_b == NULL)
+				if (first_b == NULL) {
 					break;
+				}
 				first_b = first_b->next;
 			}
 			first_a = first_b;
@@ -287,8 +306,9 @@ static void do_node_internal_buttons(bContext *C, void *UNUSED(node_v), int even
 {
 	if (event == B_NODE_EXEC) {
 		SpaceNode *snode = CTX_wm_space_node(C);
-		if (snode && snode->id)
+		if (snode && snode->id) {
 			ED_node_tag_update_id(snode->id);
+		}
 	}
 }
 
@@ -351,15 +371,17 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 	dy -= NODE_DY;
 
 	/* little bit space in top */
-	if (node->outputs.first)
+	if (node->outputs.first) {
 		dy -= NODE_DYS / 2;
+	}
 
 	/* output sockets */
 	bool add_output_space = false;
 
 	for (nsock = node->outputs.first; nsock; nsock = nsock->next) {
-		if (nodeSocketIsHidden(nsock))
+		if (nodeSocketIsHidden(nsock)) {
 			continue;
+		}
 
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr);
 
@@ -387,8 +409,9 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		nsock->locy = 0.5f * (dy + buty);
 
 		dy = buty;
-		if (nsock->next)
+		if (nsock->next) {
 			dy -= NODE_SOCKDY;
+		}
 
 		add_output_space = true;
 	}
@@ -404,14 +427,16 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 	if (node->flag & NODE_PREVIEW) {
 		float aspect = 1.0f;
 
-		if (node->preview_xsize && node->preview_ysize)
+		if (node->preview_xsize && node->preview_ysize) {
 			aspect = (float)node->preview_ysize / (float)node->preview_xsize;
+		}
 
 		dy -= NODE_DYS / 2;
 		node->prvr.ymax = dy;
 
-		if (aspect <= 1.0f)
+		if (aspect <= 1.0f) {
 			node->prvr.ymin = dy - aspect * (NODE_WIDTH(node) - NODE_DY);
+		}
 		else {
 			/* width correction of image */
 			/* XXX huh? (ton) */
@@ -426,8 +451,12 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		dy = node->prvr.ymin - NODE_DYS / 2;
 
 		/* make sure that maximums are bigger or equal to minimums */
-		if (node->prvr.xmax < node->prvr.xmin) SWAP(float, node->prvr.xmax, node->prvr.xmin);
-		if (node->prvr.ymax < node->prvr.ymin) SWAP(float, node->prvr.ymax, node->prvr.ymin);
+		if (node->prvr.xmax < node->prvr.xmin) {
+			SWAP(float, node->prvr.xmax, node->prvr.xmin);
+		}
+		if (node->prvr.ymax < node->prvr.ymin) {
+			SWAP(float, node->prvr.ymax, node->prvr.ymin);
+		}
 	}
 
 	/* buttons rect? */
@@ -456,8 +485,9 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 
 	/* input sockets */
 	for (nsock = node->inputs.first; nsock; nsock = nsock->next) {
-		if (nodeSocketIsHidden(nsock))
+		if (nodeSocketIsHidden(nsock)) {
 			continue;
+		}
 
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr);
 
@@ -483,13 +513,15 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		nsock->locy = 0.5f * (dy + buty);
 
 		dy = buty;
-		if (nsock->next)
+		if (nsock->next) {
 			dy -= NODE_SOCKDY;
+		}
 	}
 
 	/* little bit space in end */
-	if (node->inputs.first || (node->flag & (NODE_OPTIONS | NODE_PREVIEW)) == 0)
+	if (node->inputs.first || (node->flag & (NODE_OPTIONS | NODE_PREVIEW)) == 0) {
 		dy -= NODE_DYS / 2;
+	}
 
 	node->totr.xmin = locx;
 	node->totr.xmax = locx + NODE_WIDTH(node);
@@ -519,12 +551,16 @@ static void node_update_hidden(bNode *node)
 	node_to_view(node, 0.0f, 0.0f, &locx, &locy);
 
 	/* calculate minimal radius */
-	for (nsock = node->inputs.first; nsock; nsock = nsock->next)
-		if (!nodeSocketIsHidden(nsock))
+	for (nsock = node->inputs.first; nsock; nsock = nsock->next) {
+		if (!nodeSocketIsHidden(nsock)) {
 			totin++;
-	for (nsock = node->outputs.first; nsock; nsock = nsock->next)
-		if (!nodeSocketIsHidden(nsock))
+		}
+	}
+	for (nsock = node->outputs.first; nsock; nsock = nsock->next) {
+		if (!nodeSocketIsHidden(nsock)) {
 			totout++;
+		}
+	}
 
 	tot = MAX2(totin, totout);
 	if (tot > 4) {
@@ -571,10 +607,12 @@ static void node_update_hidden(bNode *node)
 
 void node_update_default(const bContext *C, bNodeTree *ntree, bNode *node)
 {
-	if (node->flag & NODE_HIDDEN)
+	if (node->flag & NODE_HIDDEN) {
 		node_update_hidden(node);
-	else
+	}
+	else {
 		node_update_basis(C, ntree, node);
+	}
 }
 
 int node_select_area_default(bNode *node, int x, int y)
@@ -618,8 +656,9 @@ static void node_draw_mute_line(View2D *v2d, SpaceNode *snode, bNode *node)
 
 	GPU_blend(true);
 
-	for (link = node->internal_links.first; link; link = link->next)
+	for (link = node->internal_links.first; link; link = link->next) {
 		node_draw_link_bezier(v2d, snode, link, TH_REDALERT, TH_REDALERT, -1);
+	}
 
 	GPU_blend(false);
 }
@@ -656,10 +695,12 @@ static void node_draw_preview_background(float tile, rctf *rect)
 		for (x = rect->xmin; x < rect->xmax; x += tile * 2) {
 			float tilex = tile, tiley = tile;
 
-			if (x + tile > rect->xmax)
+			if (x + tile > rect->xmax) {
 				tilex = rect->xmax - x;
-			if (y + tile > rect->ymax)
+			}
+			if (y + tile > rect->ymax) {
 				tiley = rect->ymax - y;
+			}
 
 			immRectf(pos, x, y, x + tilex, y + tiley);
 		}
@@ -668,10 +709,12 @@ static void node_draw_preview_background(float tile, rctf *rect)
 		for (x = rect->xmin + tile; x < rect->xmax; x += tile * 2) {
 			float tilex = tile, tiley = tile;
 
-			if (x + tile > rect->xmax)
+			if (x + tile > rect->xmax) {
 				tilex = rect->xmax - x;
-			if (y + tile > rect->ymax)
+			}
+			if (y + tile > rect->ymax) {
 				tiley = rect->ymax - y;
+			}
 
 			immRectf(pos, x, y, x + tilex, y + tiley);
 		}
@@ -740,8 +783,9 @@ void node_draw_shadow(SpaceNode *snode, bNode *node, float radius, float alpha)
 	rctf *rct = &node->totr;
 
 	UI_draw_roundbox_corner_set(UI_CNR_ALL);
-	if (node->parent == NULL)
+	if (node->parent == NULL) {
 		ui_draw_dropshadow(rct, radius, snode->aspect, alpha, node->flag & SELECT);
+	}
 	else {
 		const float margin = 3.0f;
 
@@ -790,8 +834,9 @@ void node_draw_sockets(View2D *v2d, const bContext *C, bNodeTree *ntree, bNode *
 	short selected_input_len = 0;
 	bNodeSocket *sock;
 	for (sock = node->inputs.first; sock; sock = sock->next) {
-		if (nodeSocketIsHidden(sock))
+		if (nodeSocketIsHidden(sock)) {
 			continue;
+		}
 		if (select_all || (sock->flag & SELECT)) {
 			++selected_input_len;
 			continue;
@@ -804,8 +849,9 @@ void node_draw_sockets(View2D *v2d, const bContext *C, bNodeTree *ntree, bNode *
 	short selected_output_len = 0;
 	if (draw_outputs) {
 		for (sock = node->outputs.first; sock; sock = sock->next) {
-			if (nodeSocketIsHidden(sock))
+			if (nodeSocketIsHidden(sock)) {
 				continue;
+			}
 			if (select_all || (sock->flag & SELECT)) {
 				++selected_output_len;
 				continue;
@@ -832,12 +878,14 @@ void node_draw_sockets(View2D *v2d, const bContext *C, bNodeTree *ntree, bNode *
 		if (selected_input_len) {
 			/* socket inputs */
 			for (sock = node->inputs.first; sock; sock = sock->next) {
-				if (nodeSocketIsHidden(sock))
+				if (nodeSocketIsHidden(sock)) {
 					continue;
+				}
 				if (select_all || (sock->flag & SELECT)) {
 					node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
-					if (--selected_input_len == 0)
+					if (--selected_input_len == 0) {
 						break; /* stop as soon as last one is drawn */
+					}
 				}
 			}
 		}
@@ -845,12 +893,14 @@ void node_draw_sockets(View2D *v2d, const bContext *C, bNodeTree *ntree, bNode *
 		if (selected_output_len) {
 			/* socket outputs */
 			for (sock = node->outputs.first; sock; sock = sock->next) {
-				if (nodeSocketIsHidden(sock))
+				if (nodeSocketIsHidden(sock)) {
 					continue;
+				}
 				if (select_all || (sock->flag & SELECT)) {
 					node_socket_circle_draw(C, ntree, node_ptr, sock, pos, col);
-					if (--selected_output_len == 0)
+					if (--selected_output_len == 0) {
 						break; /* stop as soon as last one is drawn */
+					}
 				}
 			}
 		}
@@ -979,8 +1029,9 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	else if (node->flag & NODE_CUSTOM_COLOR) {
 		rgba_float_args_set(color, node->color[0], node->color[1], node->color[2], 1.0f);
 	}
-	else
+	else {
 		UI_GetThemeColor4fv(TH_NODE, color);
+	}
 
 	UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
 	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD, color);
@@ -994,8 +1045,9 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	}
 
 	/* disable lines */
-	if (node->flag & NODE_MUTED)
+	if (node->flag & NODE_MUTED) {
 		node_draw_mute_line(v2d, snode, node);
+	}
 
 	node_draw_sockets(v2d, C, ntree, node, true, false);
 
@@ -1033,10 +1085,12 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	node_draw_shadow(snode, node, hiddenrad, 1.0f);
 
 	/* body */
-	if (node->flag & NODE_MUTED)
+	if (node->flag & NODE_MUTED) {
 		UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
-	else
+	}
+	else {
 		UI_GetThemeColor4fv(color_id, color);
+	}
 
 	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad, color);
 
@@ -1084,8 +1138,9 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	}
 
 	/* disable lines */
-	if (node->flag & NODE_MUTED)
+	if (node->flag & NODE_MUTED) {
 		node_draw_mute_line(&ar->v2d, snode, node);
+	}
 
 	if (node->miniwidth > 0.0f) {
 		nodeLabel(ntree, node, showname, sizeof(showname));
@@ -1137,14 +1192,18 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 
 int node_get_resize_cursor(int directions)
 {
-	if (directions == 0)
+	if (directions == 0) {
 		return CURSOR_STD;
-	else if ((directions & ~(NODE_RESIZE_TOP | NODE_RESIZE_BOTTOM)) == 0)
+	}
+	else if ((directions & ~(NODE_RESIZE_TOP | NODE_RESIZE_BOTTOM)) == 0) {
 		return CURSOR_Y_MOVE;
-	else if ((directions & ~(NODE_RESIZE_RIGHT | NODE_RESIZE_LEFT)) == 0)
+	}
+	else if ((directions & ~(NODE_RESIZE_RIGHT | NODE_RESIZE_LEFT)) == 0) {
 		return CURSOR_X_MOVE;
-	else
+	}
+	else {
 		return CURSOR_EDIT;
+	}
 }
 
 void node_set_cursor(wmWindow *win, SpaceNode *snode, float cursor[2])
@@ -1161,8 +1220,9 @@ void node_set_cursor(wmWindow *win, SpaceNode *snode, float cursor[2])
 		else {
 			/* check nodes front to back */
 			for (node = ntree->nodes.last; node; node = node->prev) {
-				if (BLI_rctf_isect_pt(&node->totr, cursor[0], cursor[1]))
+				if (BLI_rctf_isect_pt(&node->totr, cursor[0], cursor[1])) {
 					break;  /* first hit on node stops */
+				}
 			}
 			if (node) {
 				int dir = node->typeinfo->resize_area_func(node, cursor[0], cursor[1]);
@@ -1176,16 +1236,19 @@ void node_set_cursor(wmWindow *win, SpaceNode *snode, float cursor[2])
 
 void node_draw_default(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNode *node, bNodeInstanceKey key)
 {
-	if (node->flag & NODE_HIDDEN)
+	if (node->flag & NODE_HIDDEN) {
 		node_draw_hidden(C, ar, snode, ntree, node, key);
-	else
+	}
+	else {
 		node_draw_basis(C, ar, snode, ntree, node, key);
+	}
 }
 
 static void node_update(const bContext *C, bNodeTree *ntree, bNode *node)
 {
-	if (node->typeinfo->draw_nodetype_prepare)
+	if (node->typeinfo->draw_nodetype_prepare) {
 		node->typeinfo->draw_nodetype_prepare(C, ntree, node);
+	}
 }
 
 void node_update_nodetree(const bContext *C, bNodeTree *ntree)
@@ -1203,8 +1266,9 @@ void node_update_nodetree(const bContext *C, bNodeTree *ntree)
 
 static void node_draw(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNode *node, bNodeInstanceKey key)
 {
-	if (node->typeinfo->draw_nodetype)
+	if (node->typeinfo->draw_nodetype) {
 		node->typeinfo->draw_nodetype(C, ar, snode, ntree, node, key);
+	}
 }
 
 #define USE_DRAW_TOT_UPDATE
@@ -1215,7 +1279,9 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT
 	bNodeLink *link;
 	int a;
 
-	if (ntree == NULL) return;      /* groups... */
+	if (ntree == NULL) {
+		return;      /* groups... */
+	}
 
 #ifdef USE_DRAW_TOT_UPDATE
 	if (ntree->nodes.first) {
@@ -1233,8 +1299,9 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT
 		BLI_rctf_union(&ar->v2d.tot, &node->totr);
 #endif
 
-		if (!(node->flag & NODE_BACKGROUND))
+		if (!(node->flag & NODE_BACKGROUND)) {
 			continue;
+		}
 
 		key = BKE_node_instance_key(parent_key, ntree, node);
 		node->nr = a;        /* index of node in list, used for exec event code */
@@ -1245,8 +1312,9 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT
 	GPU_blend(true);
 	nodelink_batch_start(snode);
 	for (link = ntree->links.first; link; link = link->next) {
-		if (!nodeLinkIsHidden(link))
+		if (!nodeLinkIsHidden(link)) {
 			node_draw_link(&ar->v2d, snode, link);
+		}
 	}
 	nodelink_batch_end(snode);
 	GPU_blend(false);
@@ -1254,8 +1322,9 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT
 	/* draw foreground nodes, last nodes in front */
 	for (a = 0, node = ntree->nodes.first; node; node = node->next, a++) {
 		bNodeInstanceKey key;
-		if (node->flag & NODE_BACKGROUND)
+		if (node->flag & NODE_BACKGROUND) {
 			continue;
+		}
 
 		key = BKE_node_instance_key(parent_key, ntree, node);
 		node->nr = a;        /* index of node in list, used for exec event code */
@@ -1370,8 +1439,9 @@ void drawnodespace(const bContext *C, ARegion *ar)
 
 		/* store new view center in path and current edittree */
 		copy_v2_v2(path->view_center, center);
-		if (snode->edittree)
+		if (snode->edittree) {
 			copy_v2_v2(snode->edittree->view_center, center);
+		}
 
 		depth = 0;
 		while (path->prev && depth < max_depth) {
@@ -1424,8 +1494,9 @@ void drawnodespace(const bContext *C, ARegion *ar)
 		GPU_blend(true);
 		GPU_line_smooth(true);
 		for (nldrag = snode->linkdrag.first; nldrag; nldrag = nldrag->next) {
-			for (linkdata = nldrag->links.first; linkdata; linkdata = linkdata->next)
+			for (linkdata = nldrag->links.first; linkdata; linkdata = linkdata->next) {
 				node_draw_link(v2d, snode, (bNodeLink *)linkdata->data);
+			}
 		}
 		GPU_line_smooth(false);
 		GPU_blend(false);