Cleanup: add missing braces to draw manager

8 files changed, 89 insertions, 48 deletions

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index b4076b6c7e9..08abf85912b 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -516,8 +516,9 @@ static void set_pchan_colorset(Object *ob, bPoseChannel *pchan)
 		 */
 		if (pchan->agrp_index) {
 			grp = (bActionGroup *)BLI_findlink(&pose->agroups, (pchan->agrp_index - 1));
-			if (grp)
+			if (grp) {
 				color_index = grp->customCol;
+			}
 		}
 	}
 
@@ -775,8 +776,9 @@ static const float *get_bone_solid_color(
         const EditBone *UNUSED(eBone), const bPoseChannel *pchan, const bArmature *arm,
         const int boneflag, const short constflag)
 {
-	if (g_theme.const_color)
+	if (g_theme.const_color) {
 		return g_theme.bone_solid_color;
+	}
 
 	if (arm->flag & ARM_POSEMODE) {
 		static float disp_color[4];
@@ -792,8 +794,9 @@ static const float *get_bone_solid_with_consts_color(
         const EditBone *eBone, const bPoseChannel *pchan, const bArmature *arm,
         const int boneflag, const short constflag)
 {
-	if (g_theme.const_color)
+	if (g_theme.const_color) {
 		return g_theme.bone_solid_color;
+	}
 
 	const float *col = get_bone_solid_color(eBone, pchan, arm, boneflag, constflag);
 
@@ -809,12 +812,15 @@ static const float *get_bone_solid_with_consts_color(
 
 static float get_bone_wire_thickness(int boneflag)
 {
-	if (g_theme.const_color)
+	if (g_theme.const_color) {
 		return g_theme.const_wire;
-	else if (boneflag & (BONE_DRAW_ACTIVE | BONE_SELECTED))
+	}
+	else if (boneflag & (BONE_DRAW_ACTIVE | BONE_SELECTED)) {
 		return 2.0f;
-	else
+	}
+	else {
 		return 1.0f;
+	}
 }
 
 static const float *get_bone_wire_color(
@@ -1576,8 +1582,9 @@ static void pchan_draw_ik_lines(bPoseChannel *pchan, const bool only_temp, const
 	float *line_start = NULL, *line_end = NULL;
 
 	for (con = pchan->constraints.first; con; con = con->next) {
-		if (con->enforce == 0.0f)
+		if (con->enforce == 0.0f) {
 			continue;
+		}
 
 		switch (con->type) {
 			case CONSTRAINT_TYPE_KINEMATIC:
@@ -1586,8 +1593,9 @@ static void pchan_draw_ik_lines(bPoseChannel *pchan, const bool only_temp, const
 				int segcount = 0;
 
 				/* if only_temp, only draw if it is a temporary ik-chain */
-				if (only_temp && !(data->flag & CONSTRAINT_IK_TEMP))
+				if (only_temp && !(data->flag & CONSTRAINT_IK_TEMP)) {
 					continue;
+				}
 
 				/* exclude tip from chain? */
 				parchan = ((data->flag & CONSTRAINT_IK_TIP) == 0) ? pchan->parent : pchan;
@@ -1605,10 +1613,12 @@ static void pchan_draw_ik_lines(bPoseChannel *pchan, const bool only_temp, const
 				if (parchan) {
 					line_end = parchan->pose_head;
 
-					if (constflag & PCHAN_HAS_TARGET)
+					if (constflag & PCHAN_HAS_TARGET) {
 						drw_shgroup_bone_ik_lines(line_start, line_end);
-					else
+					}
+					else {
 						drw_shgroup_bone_ik_no_target_lines(line_start, line_end);
+					}
 				}
 				break;
 			}
@@ -1618,8 +1628,9 @@ static void pchan_draw_ik_lines(bPoseChannel *pchan, const bool only_temp, const
 				int segcount = 0;
 
 				/* don't draw if only_temp, as Spline IK chains cannot be temporary */
-				if (only_temp)
+				if (only_temp) {
 					continue;
+				}
 
 				parchan = pchan;
 				line_start = parchan->pose_tail;
@@ -1826,8 +1837,9 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
 				}
 
 				/* set temporary flag for drawing bone as active, but only if selected */
-				if (bone == arm->act_bone)
+				if (bone == arm->act_bone) {
 					boneflag |= BONE_DRAW_ACTIVE;
+				}
 
 				draw_bone_relations(NULL, pchan, arm, boneflag, constflag, show_relations);
 
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 45fca44772f..2bc73700462 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -3623,10 +3623,7 @@ GPUBatch *DRW_cache_cursor_get(bool crosshair_lines)
 			float x = f10 * cosf(angle);
 			float y = f10 * sinf(angle);
 
-			if (i % 2 == 0)
-				GPU_vertbuf_attr_set(vbo, attr_id.color, v, red);
-			else
-				GPU_vertbuf_attr_set(vbo, attr_id.color, v, white);
+			GPU_vertbuf_attr_set(vbo, attr_id.color, v, (i % 2 == 0) ? red : white);
 
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, v, (const float[2]){x, y});
 			GPU_indexbuf_add_generic_vert(&elb, v++);
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index d4e5027dcb2..af2539188ec 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1491,11 +1491,13 @@ static uchar mesh_render_data_looptri_flag(MeshRenderData *rdata, const BMFace *
 {
 	uchar fflag = 0;
 
-	if (efa == rdata->efa_act)
+	if (efa == rdata->efa_act) {
 		fflag |= VFLAG_FACE_ACTIVE;
+	}
 
-	if (BM_elem_flag_test(efa, BM_ELEM_SELECT))
+	if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 		fflag |= VFLAG_FACE_SELECTED;
+	}
 
 #ifdef WITH_FREESTYLE
 	if (rdata->cd.offset.freestyle_face != -1) {
@@ -1515,17 +1517,21 @@ static void mesh_render_data_edge_flag(
 {
 	eattr->e_flag |= VFLAG_EDGE_EXISTS;
 
-	if (eed == rdata->eed_act)
+	if (eed == rdata->eed_act) {
 		eattr->e_flag |= VFLAG_EDGE_ACTIVE;
+	}
 
-	if (BM_elem_flag_test(eed, BM_ELEM_SELECT))
+	if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 		eattr->e_flag |= VFLAG_EDGE_SELECTED;
+	}
 
-	if (BM_elem_flag_test(eed, BM_ELEM_SEAM))
+	if (BM_elem_flag_test(eed, BM_ELEM_SEAM)) {
 		eattr->e_flag |= VFLAG_EDGE_SEAM;
+	}
 
-	if (!BM_elem_flag_test(eed, BM_ELEM_SMOOTH))
+	if (!BM_elem_flag_test(eed, BM_ELEM_SMOOTH)) {
 		eattr->e_flag |= VFLAG_EDGE_SHARP;
+	}
 
 	/* Use a byte for value range */
 	if (rdata->cd.offset.crease != -1) {
@@ -1558,11 +1564,13 @@ static uchar mesh_render_data_vertex_flag(MeshRenderData *rdata, const BMVert *e
 	uchar vflag = VFLAG_VERTEX_EXISTS;
 
 	/* Current vertex */
-	if (eve == rdata->eve_act)
+	if (eve == rdata->eve_act) {
 		vflag |= VFLAG_VERTEX_ACTIVE;
+	}
 
-	if (BM_elem_flag_test(eve, BM_ELEM_SELECT))
+	if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 		vflag |= VFLAG_VERTEX_SELECTED;
+	}
 
 	return vflag;
 }
@@ -4803,8 +4811,9 @@ static void uvedit_fill_buffer_data(
 		float (*av)[3], (*auv)[2];
 		ushort area_stretch;
 		/* Skip hidden faces. */
-		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
+		if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) {
 			continue;
+		}
 
 		uchar face_flag = edit_uv_get_face_flag(efa, efa_act, cd_loop_uv_offset, &scene);
 		/* Face preprocess */
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index b383fcf4b92..ef44d69424b 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -1309,8 +1309,9 @@ static void particle_batch_cache_ensure_pos(
 	if (psys->part->phystype == PART_PHYS_KEYED) {
 		if (psys->flag & PSYS_KEYED) {
 			psys_count_keyed_targets(&sim);
-			if (psys->totkeyed == 0)
+			if (psys->totkeyed == 0) {
 				return;
+			}
 		}
 	}
 
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c
index 0fc4582ab44..be077126d10 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -150,8 +150,9 @@ void DRW_batching_buffer_request(
 	}
 	int new_id = 0; /* Find insertion point. */
 	for (; new_id < chunk->alloc_size; ++new_id) {
-		if (chunk->bbufs[new_id].format == NULL)
+		if (chunk->bbufs[new_id].format == NULL) {
 			break;
+		}
 	}
 	/* If there is no batch left. Allocate more. */
 	if (new_id == chunk->alloc_size) {
@@ -191,8 +192,9 @@ void DRW_instancing_buffer_request(
 	}
 	int new_id = 0; /* Find insertion point. */
 	for (; new_id < chunk->alloc_size; ++new_id) {
-		if (chunk->ibufs[new_id].format == NULL)
+		if (chunk->ibufs[new_id].format == NULL) {
 			break;
+		}
 	}
 	/* If there is no batch left. Allocate more. */
 	if (new_id == chunk->alloc_size) {
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index d311b3e8156..ad045e9ea1f 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -842,8 +842,9 @@ static bool id_type_can_have_drawdata(const short id_type)
 static bool id_can_have_drawdata(const ID *id)
 {
 	/* sanity check */
-	if (id == NULL)
+	if (id == NULL) {
 		return false;
+	}
 
 	return id_type_can_have_drawdata(GS(id->name));
 }
@@ -861,16 +862,18 @@ DrawDataList *DRW_drawdatalist_from_id(ID *id)
 		IdDdtTemplate *idt = (IdDdtTemplate *)id;
 		return &idt->drawdata;
 	}
-	else
+	else {
 		return NULL;
+	}
 }
 
 DrawData *DRW_drawdata_get(ID *id, DrawEngineType *engine_type)
 {
 	DrawDataList *drawdata = DRW_drawdatalist_from_id(id);
 
-	if (drawdata == NULL)
+	if (drawdata == NULL) {
 		return NULL;
+	}
 
 	LISTBASE_FOREACH(DrawData *, dd, drawdata) {
 		if (dd->engine_type == engine_type) {
@@ -930,8 +933,9 @@ void DRW_drawdata_free(ID *id)
 {
 	DrawDataList *drawdata = DRW_drawdatalist_from_id(id);
 
-	if (drawdata == NULL)
+	if (drawdata == NULL) {
 		return;
+	}
 
 	LISTBASE_FOREACH(DrawData *, dd, drawdata) {
 		if (dd->free != NULL) {
@@ -948,8 +952,9 @@ static void drw_drawdata_unlink_dupli(ID *id)
 	if ((GS(id->name) == ID_OB) && (((Object *)id)->base_flag & BASE_FROM_DUPLI) != 0) {
 		DrawDataList *drawdata = DRW_drawdatalist_from_id(id);
 
-		if (drawdata == NULL)
+		if (drawdata == NULL) {
 			return;
+		}
 
 		BLI_listbase_clear((ListBase *)drawdata);
 	}
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 79a658829be..204896c5132 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -674,24 +674,33 @@ static void drw_shgroup_init(DRWShadingGroup *shgroup, GPUShader *shader)
 	shgroup->callid = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_CALLID);
 
 	shgroup->matflag = 0;
-	if (shgroup->modelinverse > -1)
+	if (shgroup->modelinverse > -1) {
 		shgroup->matflag |= DRW_CALL_MODELINVERSE;
-	if (shgroup->modelview > -1)
+	}
+	if (shgroup->modelview > -1) {
 		shgroup->matflag |= DRW_CALL_MODELVIEW;
-	if (shgroup->modelviewinverse > -1)
+	}
+	if (shgroup->modelviewinverse > -1) {
 		shgroup->matflag |= DRW_CALL_MODELVIEWINVERSE;
-	if (shgroup->modelviewprojection > -1)
+	}
+	if (shgroup->modelviewprojection > -1) {
 		shgroup->matflag |= DRW_CALL_MODELVIEWPROJECTION;
-	if (shgroup->normalview > -1)
+	}
+	if (shgroup->normalview > -1) {
 		shgroup->matflag |= DRW_CALL_NORMALVIEW;
-	if (shgroup->normalworld > -1)
+	}
+	if (shgroup->normalworld > -1) {
 		shgroup->matflag |= DRW_CALL_NORMALWORLD;
-	if (shgroup->orcotexfac > -1)
+	}
+	if (shgroup->orcotexfac > -1) {
 		shgroup->matflag |= DRW_CALL_ORCOTEXFAC;
-	if (shgroup->objectinfo > -1)
+	}
+	if (shgroup->objectinfo > -1) {
 		shgroup->matflag |= DRW_CALL_OBJECTINFO;
-	if (shgroup->eye > -1)
+	}
+	if (shgroup->eye > -1) {
 		shgroup->matflag |= DRW_CALL_EYEVEC;
+	}
 }
 
 static void drw_shgroup_instance_init(
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index df2daa998fe..787f4ee7b40 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -521,8 +521,9 @@ static void draw_frustum_boundbox_calc(const float(*projmat)[4], BoundBox *r_bbo
 
 static void draw_clipping_setup_from_view(void)
 {
-	if (DST.clipping.updated)
+	if (DST.clipping.updated) {
 		return;
+	}
 
 	float (*viewinv)[4] = DST.view_data.matstate.mat[DRW_MAT_VIEWINV];
 	float (*projmat)[4] = DST.view_data.matstate.mat[DRW_MAT_WIN];
@@ -684,14 +685,16 @@ bool DRW_culling_sphere_test(BoundSphere *bsphere)
 	draw_clipping_setup_from_view();
 
 	/* Bypass test if radius is negative. */
-	if (bsphere->radius < 0.0f)
+	if (bsphere->radius < 0.0f) {
 		return true;
+	}
 
 	/* Do a rough test first: Sphere VS Sphere intersect. */
 	BoundSphere *frustum_bsphere = &DST.clipping.frustum_bsphere;
 	float center_dist = len_squared_v3v3(bsphere->center, frustum_bsphere->center);
-	if (center_dist > SQUARE(bsphere->radius + frustum_bsphere->radius))
+	if (center_dist > SQUARE(bsphere->radius + frustum_bsphere->radius)) {
 		return false;
+	}
 
 	/* Test against the 6 frustum planes. */
 	for (int p = 0; p < 6; p++) {
@@ -1012,8 +1015,9 @@ static void release_texture_slots(bool with_persist)
 	}
 	else {
 		for (int i = 0; i < GPU_max_textures(); ++i) {
-			if (DST.RST.bound_tex_slots[i] != BIND_PERSIST)
+			if (DST.RST.bound_tex_slots[i] != BIND_PERSIST) {
 				DST.RST.bound_tex_slots[i] = BIND_NONE;
+			}
 		}
 	}
 
@@ -1029,8 +1033,9 @@ static void release_ubo_slots(bool with_persist)
 	}
 	else {
 		for (int i = 0; i < GPU_max_ubo_binds(); ++i) {
-			if (DST.RST.bound_ubo_slots[i] != BIND_PERSIST)
+			if (DST.RST.bound_ubo_slots[i] != BIND_PERSIST) {
 				DST.RST.bound_ubo_slots[i] = BIND_NONE;
+			}
 		}
 	}
 
@@ -1317,8 +1322,9 @@ static void drw_update_view(void)
 
 static void drw_draw_pass_ex(DRWPass *pass, DRWShadingGroup *start_group, DRWShadingGroup *end_group)
 {
-	if (start_group == NULL)
+	if (start_group == NULL) {
 		return;
+	}
 
 	DST.shader = NULL;