Cleanup: style, use braces for editor/spaces

1 files changed, 78 insertions, 35 deletions

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 75f6f9f7c9a..d46c7a292cb 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -88,13 +88,17 @@ ARegion *view3d_has_buttons_region(ScrArea *sa)
 	ARegion *ar, *arnew;
 
 	ar = BKE_area_find_region_type(sa, RGN_TYPE_UI);
-	if (ar) return ar;
+	if (ar) {
+		return ar;
+	}
 
 	/* add subdiv level; after header */
 	ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
 
 	/* is error! */
-	if (ar == NULL) return NULL;
+	if (ar == NULL) {
+		return NULL;
+	}
 
 	arnew = MEM_callocN(sizeof(ARegion), "buttons for view3d");
 
@@ -112,8 +116,9 @@ ARegion *view3d_has_tools_region(ScrArea *sa)
 	ARegion *ar, *artool = NULL, *arhead;
 
 	for (ar = sa->regionbase.first; ar; ar = ar->next) {
-		if (ar->regiontype == RGN_TYPE_TOOLS)
+		if (ar->regiontype == RGN_TYPE_TOOLS) {
 			artool = ar;
+		}
 	}
 
 	/* tool region hide/unhide also hides props */
@@ -123,12 +128,16 @@ ARegion *view3d_has_tools_region(ScrArea *sa)
 
 	if (artool == NULL) {
 		/* add subdiv level; after header */
-		for (arhead = sa->regionbase.first; arhead; arhead = arhead->next)
-			if (arhead->regiontype == RGN_TYPE_HEADER)
+		for (arhead = sa->regionbase.first; arhead; arhead = arhead->next) {
+			if (arhead->regiontype == RGN_TYPE_HEADER) {
 				break;
+			}
+		}
 
 		/* is error! */
-		if (arhead == NULL) return NULL;
+		if (arhead == NULL) {
+			return NULL;
+		}
 
 		artool = MEM_callocN(sizeof(ARegion), "tools for view3d");
 
@@ -402,14 +411,20 @@ static void view3d_free(SpaceLink *sl)
 {
 	View3D *vd = (View3D *) sl;
 
-	if (vd->localvd) MEM_freeN(vd->localvd);
+	if (vd->localvd) {
+		MEM_freeN(vd->localvd);
+	}
 
-	if (vd->properties_storage) MEM_freeN(vd->properties_storage);
+	if (vd->properties_storage) {
+		MEM_freeN(vd->properties_storage);
+	}
 
-	if (vd->fx_settings.ssao)
+	if (vd->fx_settings.ssao) {
 		MEM_freeN(vd->fx_settings.ssao);
-	if (vd->fx_settings.dof)
+	}
+	if (vd->fx_settings.dof) {
 		MEM_freeN(vd->fx_settings.dof);
+	}
 }
 
 
@@ -431,16 +446,19 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
 		v3dn->properties_storage = NULL;
 	}
 
-	if (v3dn->shading.type == OB_RENDER)
+	if (v3dn->shading.type == OB_RENDER) {
 		v3dn->shading.type = OB_SOLID;
+	}
 
 	/* copy or clear inside new stuff */
 
 	v3dn->properties_storage = NULL;
-	if (v3dn->fx_settings.dof)
+	if (v3dn->fx_settings.dof) {
 		v3dn->fx_settings.dof = MEM_dupallocN(v3do->fx_settings.dof);
-	if (v3dn->fx_settings.ssao)
+	}
+	if (v3dn->fx_settings.ssao) {
 		v3dn->fx_settings.ssao = MEM_dupallocN(v3do->fx_settings.ssao);
+	}
 
 	return (SpaceLink *)v3dn;
 }
@@ -709,14 +727,21 @@ static void view3d_main_region_free(ARegion *ar)
 	RegionView3D *rv3d = ar->regiondata;
 
 	if (rv3d) {
-		if (rv3d->localvd) MEM_freeN(rv3d->localvd);
-		if (rv3d->clipbb) MEM_freeN(rv3d->clipbb);
+		if (rv3d->localvd) {
+			MEM_freeN(rv3d->localvd);
+		}
+		if (rv3d->clipbb) {
+			MEM_freeN(rv3d->clipbb);
+		}
 
-		if (rv3d->render_engine)
+		if (rv3d->render_engine) {
 			RE_engine_free(rv3d->render_engine);
+		}
 
 		if (rv3d->depths) {
-			if (rv3d->depths->depths) MEM_freeN(rv3d->depths->depths);
+			if (rv3d->depths->depths) {
+				MEM_freeN(rv3d->depths->depths);
+			}
 			MEM_freeN(rv3d->depths);
 		}
 		if (rv3d->sms) {
@@ -735,10 +760,12 @@ static void *view3d_main_region_duplicate(void *poin)
 		RegionView3D *rv3d = poin, *new;
 
 		new = MEM_dupallocN(rv3d);
-		if (rv3d->localvd)
+		if (rv3d->localvd) {
 			new->localvd = MEM_dupallocN(rv3d->localvd);
-		if (rv3d->clipbb)
+		}
+		if (rv3d->clipbb) {
 			new->clipbb = MEM_dupallocN(rv3d->clipbb);
+		}
 
 		new->depths = NULL;
 		new->render_engine = NULL;
@@ -773,12 +800,14 @@ static void view3d_main_region_listener(
 					break;
 				case ND_NLA:
 				case ND_KEYFRAME:
-					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED))
+					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED)) {
 						ED_region_tag_redraw(ar);
+					}
 					break;
 				case ND_ANIMCHAN:
-					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED, NA_SELECTED))
+					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED, NA_SELECTED)) {
 						ED_region_tag_redraw(ar);
+					}
 					break;
 			}
 			break;
@@ -821,8 +850,9 @@ static void view3d_main_region_listener(
 					break;
 				}
 			}
-			if (wmn->action == NA_EDITED)
+			if (wmn->action == NA_EDITED) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_OBJECT:
 			switch (wmn->data) {
@@ -949,8 +979,9 @@ static void view3d_main_region_listener(
 			ED_region_tag_redraw(ar);
 			break;
 		case NC_MOVIECLIP:
-			if (wmn->data == ND_DISPLAY || wmn->action == NA_EDITED)
+			if (wmn->data == ND_DISPLAY || wmn->action == NA_EDITED) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_SPACE:
 			if (wmn->data == ND_SPACE_VIEW3D) {
@@ -962,8 +993,9 @@ static void view3d_main_region_listener(
 			}
 			break;
 		case NC_ID:
-			if (wmn->action == NA_RENAME)
+			if (wmn->action == NA_RENAME) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_SCREEN:
 			switch (wmn->data) {
@@ -1136,12 +1168,14 @@ static void view3d_header_region_listener(
 			}
 			break;
 		case NC_SPACE:
-			if (wmn->data == ND_SPACE_VIEW3D)
+			if (wmn->data == ND_SPACE_VIEW3D) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_GPENCIL:
-			if (wmn->data & ND_GPENCIL_EDITMODE)
+			if (wmn->data & ND_GPENCIL_EDITMODE) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 	}
 }
@@ -1206,8 +1240,9 @@ static void view3d_buttons_region_listener(
 					break;
 				case ND_NLA:
 				case ND_KEYFRAME:
-					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED))
+					if (ELEM(wmn->action, NA_EDITED, NA_ADDED, NA_REMOVED)) {
 						ED_region_tag_redraw(ar);
+					}
 					break;
 			}
 			break;
@@ -1251,8 +1286,9 @@ static void view3d_buttons_region_listener(
 					ED_region_tag_redraw(ar);
 					break;
 			}
-			if (wmn->action == NA_EDITED)
+			if (wmn->action == NA_EDITED) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_TEXTURE:
 		case NC_MATERIAL:
@@ -1261,25 +1297,30 @@ static void view3d_buttons_region_listener(
 			break;
 		case NC_BRUSH:
 			/* NA_SELECTED is used on brush changes */
-			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED))
+			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_SPACE:
-			if (wmn->data == ND_SPACE_VIEW3D)
+			if (wmn->data == ND_SPACE_VIEW3D) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_ID:
-			if (wmn->action == NA_RENAME)
+			if (wmn->action == NA_RENAME) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_GPENCIL:
-			if ((wmn->data & (ND_DATA | ND_GPENCIL_EDITMODE)) || (wmn->action == NA_EDITED))
+			if ((wmn->data & (ND_DATA | ND_GPENCIL_EDITMODE)) || (wmn->action == NA_EDITED)) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 		case NC_IMAGE:
 			/* Update for the image layers in texture paint. */
-			if (wmn->action == NA_EDITED)
+			if (wmn->action == NA_EDITED) {
 				ED_region_tag_redraw(ar);
+			}
 			break;
 	}
 }
@@ -1311,8 +1352,9 @@ static void space_view3d_listener(
 		case NC_SCENE:
 			switch (wmn->data) {
 				case ND_WORLD:
-					if (v3d->flag2 & V3D_HIDE_OVERLAYS)
+					if (v3d->flag2 & V3D_HIDE_OVERLAYS) {
 						ED_area_tag_redraw_regiontype(sa, RGN_TYPE_WINDOW);
+					}
 					break;
 			}
 			break;
@@ -1329,8 +1371,9 @@ static void space_view3d_listener(
 		case NC_MATERIAL:
 			switch (wmn->data) {
 				case ND_NODES:
-					if (v3d->shading.type == OB_TEXTURE)
+					if (v3d->shading.type == OB_TEXTURE) {
 						ED_area_tag_redraw_regiontype(sa, RGN_TYPE_WINDOW);
+					}
 					break;
 			}
 			break;