Cleanup: style, use braces for editor/spaces

1 files changed, 84 insertions, 35 deletions

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 5e59c36a80f..cfbc604852b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -105,10 +105,12 @@ void ED_view3d_update_viewmat(
 	RegionView3D *rv3d = ar->regiondata;
 
 	/* setup window matrices */
-	if (winmat)
+	if (winmat) {
 		copy_m4_m4(rv3d->winmat, winmat);
-	else
+	}
+	else {
 		view3d_winmatrix_set(depsgraph, ar, v3d, rect);
+	}
 
 	/* setup view matrix */
 	if (viewmat) {
@@ -231,8 +233,9 @@ static void view3d_stereo3d_setup(
 	const char *viewname;
 
 	/* show only left or right camera */
-	if (v3d->stereo3d_camera != STEREO_3D_ID)
+	if (v3d->stereo3d_camera != STEREO_3D_ID) {
 		v3d->multiview_eye = v3d->stereo3d_camera;
+	}
 
 	is_left = v3d->multiview_eye == STEREO_LEFT_ID;
 	viewname = names[is_left ? STEREO_LEFT_ID : STEREO_RIGHT_ID];
@@ -305,8 +308,9 @@ static void view3d_camera_border(
 	/* get viewport viewplane */
 	BKE_camera_params_init(&params);
 	BKE_camera_params_from_view3d(&params, depsgraph, v3d, rv3d);
-	if (no_zoom)
+	if (no_zoom) {
 		params.zoom = 1.0f;
+	}
 	BKE_camera_params_compute_viewplane(&params, ar->winx, ar->winy, 1.0f, 1.0f);
 	rect_view = params.viewplane;
 
@@ -393,7 +397,9 @@ static void drawviewborder_triangle(
 		else {
 			ofs = h * (h / w);
 		}
-		if (dir == 'B') SWAP(float, y1, y2);
+		if (dir == 'B') {
+			SWAP(float, y1, y2);
+		}
 
 		immVertex2f(shdr_pos, x1, y1);
 		immVertex2f(shdr_pos, x2, y2);
@@ -411,7 +417,9 @@ static void drawviewborder_triangle(
 		else {
 			ofs = w * (w / h);
 		}
-		if (dir == 'B') SWAP(float, x1, x2);
+		if (dir == 'B') {
+			SWAP(float, x1, x2);
+		}
 
 		immVertex2f(shdr_pos, x1, y1);
 		immVertex2f(shdr_pos, x2, y2);
@@ -435,10 +443,12 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View
 	Camera *ca = NULL;
 	RegionView3D *rv3d = ar->regiondata;
 
-	if (v3d->camera == NULL)
+	if (v3d->camera == NULL) {
 		return;
-	if (v3d->camera->type == OB_CAMERA)
+	}
+	if (v3d->camera->type == OB_CAMERA) {
 		ca = v3d->camera->data;
+	}
 
 	ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &viewborder, false);
 	/* the offsets */
@@ -482,14 +492,18 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View
 
 			immUniformColor4f(0.0f, 0.0f, 0.0f, alpha);
 
-			if (x1i > 0.0f)
+			if (x1i > 0.0f) {
 				immRectf(shdr_pos, 0.0f, winy, x1i, 0.0f);
-			if (x2i < winx)
+			}
+			if (x2i < winx) {
 				immRectf(shdr_pos, x2i, winy, winx, 0.0f);
-			if (y2i < winy)
+			}
+			if (y2i < winy) {
 				immRectf(shdr_pos, x1i, winy, x2i, y2i);
-			if (y2i > 0.0f)
+			}
+			if (y2i > 0.0f) {
 				immRectf(shdr_pos, x1i, y1i, x2i, 0.0f);
+			}
 
 			GPU_blend(false);
 		}
@@ -762,8 +776,9 @@ float ED_scene_grid_scale(Scene *scene, const char **grid_unit)
 
 		if (usys) {
 			int i = bUnit_GetBaseUnit(usys);
-			if (grid_unit)
+			if (grid_unit) {
 				*grid_unit = bUnit_GetNameDisplay(usys, i);
+			}
 			return (float)bUnit_GetScaler(usys, i) / scene->unit.scale_length;
 		}
 	}
@@ -963,8 +978,9 @@ static void draw_rotation_guide(const RegionView3D *rv3d)
 
 		color[3] = 255;  /* solid dot */
 	}
-	else
+	else {
 		color[3] = 127;  /* see-through dot */
+	}
 
 	immUnbindProgram();
 
@@ -1026,28 +1042,52 @@ static const char *view3d_get_name(View3D *v3d, RegionView3D *rv3d)
 
 	switch (rv3d->view) {
 		case RV3D_VIEW_FRONT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Front Orthographic");
-			else name = IFACE_("Front Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Front Orthographic");
+			}
+			else {
+				name = IFACE_("Front Perspective");
+			}
 			break;
 		case RV3D_VIEW_BACK:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Back Orthographic");
-			else name = IFACE_("Back Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Back Orthographic");
+			}
+			else {
+				name = IFACE_("Back Perspective");
+			}
 			break;
 		case RV3D_VIEW_TOP:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Top Orthographic");
-			else name = IFACE_("Top Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Top Orthographic");
+			}
+			else {
+				name = IFACE_("Top Perspective");
+			}
 			break;
 		case RV3D_VIEW_BOTTOM:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Bottom Orthographic");
-			else name = IFACE_("Bottom Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Bottom Orthographic");
+			}
+			else {
+				name = IFACE_("Bottom Perspective");
+			}
 			break;
 		case RV3D_VIEW_RIGHT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Right Orthographic");
-			else name = IFACE_("Right Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Right Orthographic");
+			}
+			else {
+				name = IFACE_("Right Perspective");
+			}
 			break;
 		case RV3D_VIEW_LEFT:
-			if (rv3d->persp == RV3D_ORTHO) name = IFACE_("Left Orthographic");
-			else name = IFACE_("Left Perspective");
+			if (rv3d->persp == RV3D_ORTHO) {
+				name = IFACE_("Left Orthographic");
+			}
+			else {
+				name = IFACE_("Left Perspective");
+			}
 			break;
 
 		default:
@@ -1217,10 +1257,12 @@ static void draw_selected_name(Scene *scene, ViewLayer *view_layer, Object *ob,
 	}
 	else {
 		/* no object */
-		if (ED_gpencil_has_keyframe_v3d(scene, NULL, cfra))
+		if (ED_gpencil_has_keyframe_v3d(scene, NULL, cfra)) {
 			UI_FontThemeColor(font_id, TH_TIME_GP_KEYFRAME);
-		else
+		}
+		else {
 			UI_FontThemeColor(font_id, TH_TEXT_HI);
+		}
 	}
 
 	if (markern) {
@@ -1432,10 +1474,12 @@ void ED_view3d_draw_offscreen(
 	GPU_matrix_push();
 	GPU_matrix_identity_set();
 
-	if ((viewname != NULL && viewname[0] != '\0') && (viewmat == NULL) && rv3d->persp == RV3D_CAMOB && v3d->camera)
+	if ((viewname != NULL && viewname[0] != '\0') && (viewmat == NULL) && rv3d->persp == RV3D_CAMOB && v3d->camera) {
 		view3d_stereo3d_setup_offscreen(depsgraph, scene, v3d, ar, winmat, viewname);
-	else
+	}
+	else {
 		view3d_main_region_setup_view(depsgraph, scene, v3d, ar, viewmat, winmat, NULL);
+	}
 
 	/* main drawing call */
 	DRW_draw_render_loop_offscreen(
@@ -1638,8 +1682,9 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 		GPU_framebuffer_bind(old_fb);
 	}
 
-	if (ibuf->rect_float && ibuf->rect)
+	if (ibuf->rect_float && ibuf->rect) {
 		IMB_rect_from_float(ibuf);
+	}
 
 	return ibuf;
 }
@@ -1727,11 +1772,15 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
 
 static bool view3d_clipping_test(const float co[3], const float clip[6][4])
 {
-	if (plane_point_side_v3(clip[0], co) > 0.0f)
-		if (plane_point_side_v3(clip[1], co) > 0.0f)
-			if (plane_point_side_v3(clip[2], co) > 0.0f)
-				if (plane_point_side_v3(clip[3], co) > 0.0f)
+	if (plane_point_side_v3(clip[0], co) > 0.0f) {
+		if (plane_point_side_v3(clip[1], co) > 0.0f) {
+			if (plane_point_side_v3(clip[2], co) > 0.0f) {
+				if (plane_point_side_v3(clip[3], co) > 0.0f) {
 					return false;
+				}
+			}
+		}
+	}
 
 	return true;
 }