Cleanup: style, use braces for draw

5 files changed, 30 insertions, 22 deletions

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index a26313a1402..13d9be9825e 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -643,10 +643,10 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const
 		{
 			if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
 				uchar cp[4];
-				if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 80);
-				else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 80);
-				else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 80);
-				else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 80);
+				if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 80); }
+				else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 80); }
+				else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 80); }
+				else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 80); }
 				else {
 					return false;
 				}
@@ -726,11 +726,11 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const
 			/* inner part in background color or constraint */
 			if ((constflag) && ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS))) {
 				uchar cp[4];
-				if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 255);
-				else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 255);
-				else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 255);
-				else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 255);
-				else if (constflag) UI_GetThemeColor4ubv(TH_BONE_POSE, cp);  /* PCHAN_HAS_ACTION */
+				if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 255); }
+				else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 255); }
+				else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 255); }
+				else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 255); }
+				else if (constflag) { UI_GetThemeColor4ubv(TH_BONE_POSE, cp); }  /* PCHAN_HAS_ACTION */
 
 				rgb_uchar_to_float(fcolor, cp);
 			}
@@ -1656,7 +1656,9 @@ static void pchan_draw_ik_lines(
 				while (parchan->parent) {
 					segcount++;
 					/* FIXME: revise the breaking conditions */
-					if (segcount == data->chainlen || segcount > 255) break;  /* 255 is weak */
+					if (segcount == data->chainlen || segcount > 255) {
+						break;  /* 255 is weak */
+					}
 					parchan = parchan->parent;
 				}
 				/* Only draw line in case our chain is more than one bone long! */
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 49cc6669ba5..573b906413f 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -1003,11 +1003,11 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color
 			theme_id = (active) ? TH_ACTIVE : TH_SELECT;
 		}
 		else {
-			if (ob->type == OB_LAMP) theme_id = TH_LIGHT;
-			else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
-			else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
-			else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
-			else if (ob->type == OB_LIGHTPROBE) theme_id = TH_EMPTY; /* TODO add lightprobe color */
+			if      (ob->type == OB_LAMP) { theme_id = TH_LIGHT; }
+			else if (ob->type == OB_SPEAKER) { theme_id = TH_SPEAKER; }
+			else if (ob->type == OB_CAMERA) { theme_id = TH_CAMERA; }
+			else if (ob->type == OB_EMPTY) { theme_id = TH_EMPTY; }
+			else if (ob->type == OB_LIGHTPROBE) { theme_id = TH_EMPTY; } /* TODO add lightprobe color */
 			/* fallback to TH_WIRE */
 		}
 	}
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index c11c183e0f5..7233036effe 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -1179,8 +1179,8 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b)
 	const DRWCall *call_a = (DRWCall *)shgrp_a->calls.first;
 	const DRWCall *call_b = (DRWCall *)shgrp_b->calls.first;
 
-	if (call_a == NULL) return -1;
-	if (call_b == NULL) return -1;
+	if (call_a == NULL) { return -1; }
+	if (call_b == NULL) { return -1; }
 
 	float tmp[3];
 	sub_v3_v3v3(tmp, zsortdata->origin, call_a->state->model[3]);
@@ -1188,8 +1188,8 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b)
 	sub_v3_v3v3(tmp, zsortdata->origin, call_b->state->model[3]);
 	const float b_sq = dot_v3v3(zsortdata->axis, tmp);
 
-	if      (a_sq < b_sq) return  1;
-	else if (a_sq > b_sq) return -1;
+	if      (a_sq < b_sq) { return  1; }
+	else if (a_sq > b_sq) { return -1; }
 	else {
 		/* If there is a depth prepass put it before */
 		if ((shgrp_a->state_extra & DRW_STATE_WRITE_DEPTH) != 0) {
@@ -1198,7 +1198,9 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b)
 		else if ((shgrp_b->state_extra & DRW_STATE_WRITE_DEPTH) != 0) {
 			return  1;
 		}
-		else return  0;
+		else {
+			return  0;
+		}
 	}
 }
 
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index b18e000665f..cf328dcceb5 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -1035,7 +1035,9 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
 	bool use_tfeedback = false;
 
 	if (shader_changed) {
-		if (DST.shader) GPU_shader_unbind();
+		if (DST.shader) {
+			GPU_shader_unbind();
+		}
 		GPU_shader_bind(shgroup->shader);
 		DST.shader = shgroup->shader;
 	}
diff --git a/source/blender/draw/intern/draw_manager_profiling.c b/source/blender/draw/intern/draw_manager_profiling.c
index 03811688982..51c0f4c4640 100644
--- a/source/blender/draw/intern/draw_manager_profiling.c
+++ b/source/blender/draw/intern/draw_manager_profiling.c
@@ -326,7 +326,9 @@ void DRW_stats_draw(rcti *rect)
 		DRWTimer *timer_parent = (timer->lvl > 0) ? &DTP.timers[lvl_index[timer->lvl - 1]] : NULL;
 
 		/* Only display a number of lvl at a time */
-		if ((G.debug_value - 21) < timer->lvl) continue;
+		if ((G.debug_value - 21) < timer->lvl) {
+			continue;
+		}
 
 		BLI_assert(timer->lvl < MAX_NESTED_TIMER);
 		lvl_index[timer->lvl] = i;