Cleanup: Style

10 files changed, 73 insertions, 70 deletions

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index 9766bccd32c..54bae5de85c 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -101,7 +101,7 @@ typedef struct CLAY_StorageList {
 } CLAY_StorageList;
 
 /* keep it under MAX_BUFFERS */
-typedef struct CLAY_FramebufferList{
+typedef struct CLAY_FramebufferList {
 	/* default */
 	struct GPUFrameBuffer *default_fb;
 	/* engine specific */
@@ -109,7 +109,7 @@ typedef struct CLAY_FramebufferList{
 } CLAY_FramebufferList;
 
 /* keep it under MAX_TEXTURES */
-typedef struct CLAY_TextureList{
+typedef struct CLAY_TextureList {
 	/* default */
 	struct GPUTexture *color;
 	struct GPUTexture *depth;
@@ -125,7 +125,7 @@ enum {
 };
 
 /* keep it under MAX_PASSES */
-typedef struct CLAY_PassList{
+typedef struct CLAY_PassList {
 	struct DRWPass *depth_pass;
 	struct DRWPass *depth_pass_cull;
 	struct DRWPass *clay_pass;
@@ -463,8 +463,7 @@ static int search_mat_to_ubo(CLAY_Storage *storage, float matcap_rot, float matc
 {
 	/* For now just use a linear search and test all parameters */
 	/* TODO make a hash table */
-	for (int i = 0; i < storage->ubo_current_id; ++i)
-	{
+	for (int i = 0; i < storage->ubo_current_id; ++i) {
 		CLAY_UBO_Material *ubo = &storage->mat_storage.materials[i];
 
 		if ((ubo->matcap_rot[0] == cosf(matcap_rot * 3.14159f * 2.0f)) &&
@@ -584,7 +583,7 @@ static DRWShadingGroup *CLAY_object_shgrp_get(Object *ob, CLAY_StorageList *stl,
 		override_setting(ces, "ssao_factor_edge", &ssao_factor_edge);
 		override_setting(ces, "ssao_attenuation", &ssao_attenuation);
 		override_setting(ces, "matcap_icon", &matcap_icon);
-	};
+	}
 
 	int id = mat_in_ubo(stl->storage, matcap_rot, matcap_hue, matcap_sat, matcap_val,
 	                    ssao_distance, ssao_factor_cavity, ssao_factor_edge,
diff --git a/source/blender/draw/engines/clay/clay.h b/source/blender/draw/engines/clay/clay.h
index 404924be2a1..add2a45fbd7 100644
--- a/source/blender/draw/engines/clay/clay.h
+++ b/source/blender/draw/engines/clay/clay.h
@@ -23,8 +23,8 @@
  *  \ingroup DNA
  */
 
-#ifndef __ENGINE_CLAY_H__
-#define __ENGINE_CLAY_H__
+#ifndef __CLAY_H__
+#define __CLAY_H__
 
 extern RenderEngineType viewport_clay_type;
 
@@ -33,4 +33,4 @@ struct MaterialEngineSettings *CLAY_material_settings_create(void);
 
 void clay_engine_free(void);
 
-#endif /* __ENGINE_CLAY_H__ */
\ No newline at end of file
+#endif /* __CLAY_H__ */
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 1fa3b84effd..7ad1c309581 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -92,11 +92,11 @@ typedef enum {
 } DRWTextureFlag;
 
 struct GPUTexture *DRW_texture_create_1D(
-		int w, DRWTextureFormat format, DRWTextureFlag flags, const float *fpixels);
+        int w, DRWTextureFormat format, DRWTextureFlag flags, const float *fpixels);
 struct GPUTexture *DRW_texture_create_2D(
-		int w, int h, DRWTextureFormat format, DRWTextureFlag flags, const float *fpixels);
+        int w, int h, DRWTextureFormat format, DRWTextureFlag flags, const float *fpixels);
 struct GPUTexture *DRW_texture_create_2D_array(
-		int w, int h, int d, DRWTextureFormat UNUSED(format), DRWTextureFlag flags, const float *fpixels);
+        int w, int h, int d, DRWTextureFormat UNUSED(format), DRWTextureFlag flags, const float *fpixels);
 void DRW_texture_free(struct GPUTexture *tex);
 
 /* UBOs */
@@ -231,4 +231,4 @@ void *DRW_mode_pass_list_get(void);
 void *DRW_mode_storage_list_get(void);
 void *DRW_mode_texture_list_get(void);
 void *DRW_mode_framebuffer_list_get(void);
-#endif /* __DRW_RENDER_H__ */
\ No newline at end of file
+#endif /* __DRW_RENDER_H__ */
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 8f30f8936d0..4f9b4926fb6 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -37,7 +37,7 @@
 
 #include "draw_cache.h"
 
-static struct DRWShapeCache{
+static struct DRWShapeCache {
 	Batch *drw_single_vertice;
 	Batch *drw_fullscreen_quad;
 	Batch *drw_plain_axes;
@@ -201,8 +201,8 @@ static VertexBuffer *sphere_wire_vbo(const float rad)
 			for (int j = 0; j < 2; ++j) {
 				float cv[2], v[3];
 
-				cv[0] = p[(i+j) % NSEGMENTS][0];
-				cv[1] = p[(i+j) % NSEGMENTS][1];
+				cv[0] = p[(i + j) % NSEGMENTS][0];
+				cv[1] = p[(i + j) % NSEGMENTS][1];
 
 				if (axis == 0)
 					v[0] = cv[0], v[1] = cv[1], v[2] = 0.0f;
@@ -211,7 +211,7 @@ static VertexBuffer *sphere_wire_vbo(const float rad)
 				else
 					v[0] = 0.0f,  v[1] = cv[0], v[2] = cv[1];
 
-				setAttrib(vbo, pos_id, i*2 + j + (NSEGMENTS * 2 * axis), v);
+				setAttrib(vbo, pos_id, i * 2 + j + (NSEGMENTS * 2 * axis), v);
 			}
 		}
 	}
@@ -268,7 +268,7 @@ Batch *DRW_cache_cube_get(void)
 			{ 1.0f,  1.0f,  1.0f}
 		};
 
-		const GLubyte indices[24] = {0,1,1,3,3,2,2,0,0,4,4,5,5,7,7,6,6,4,1,5,3,7,2,6};
+		const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6};
 
 		/* Position Only 3D format */
 		static VertexFormat format = { 0 };
@@ -460,17 +460,17 @@ Batch *DRW_cache_empty_cone_get(void)
 
 			/* cone sides */
 			v[0] = cv[0], v[1] = 0.0f, v[2] = cv[1];
-			setAttrib(vbo, pos_id, i*4, v);
+			setAttrib(vbo, pos_id, i * 4, v);
 			v[0] = 0.0f, v[1] = 2.0f, v[2] = 0.0f;
-			setAttrib(vbo, pos_id, i*4 + 1, v);
+			setAttrib(vbo, pos_id, i * 4 + 1, v);
 
 			/* end ring */
 			v[0] = cv[0], v[1] = 0.0f, v[2] = cv[1];
-			setAttrib(vbo, pos_id, i*4 + 2, v);
-			cv[0] = p[(i+1) % NSEGMENTS][0];
-			cv[1] = p[(i+1) % NSEGMENTS][1];
+			setAttrib(vbo, pos_id, i * 4 + 2, v);
+			cv[0] = p[(i + 1) % NSEGMENTS][0];
+			cv[1] = p[(i + 1) % NSEGMENTS][1];
 			v[0] = cv[0], v[1] = 0.0f, v[2] = cv[1];
-			setAttrib(vbo, pos_id, i*4 + 3, v);
+			setAttrib(vbo, pos_id, i * 4 + 3, v);
 		}
 
 		SHC.drw_empty_cone = Batch_create(GL_LINES, vbo, NULL);
@@ -768,10 +768,10 @@ Batch *DRW_cache_bone_octahedral_wire_outline_get(void)
 		VertexBuffer_allocate_data(vbo, 12 * 2);
 
 		for (int i = 0; i < 12; i++) {
-			const float *co1 = bone_octahedral_verts[bone_octahedral_wire[i*2]];
-			const float *co2 = bone_octahedral_verts[bone_octahedral_wire[i*2+1]];
-			const float *n1 = bone_octahedral_solid_normals[bone_octahedral_wire_adjacent_face[i*2]];
-			const float *n2 = bone_octahedral_solid_normals[bone_octahedral_wire_adjacent_face[i*2+1]];
+			const float *co1 = bone_octahedral_verts[bone_octahedral_wire[i * 2]];
+			const float *co2 = bone_octahedral_verts[bone_octahedral_wire[i * 2 + 1]];
+			const float *n1 = bone_octahedral_solid_normals[bone_octahedral_wire_adjacent_face[i * 2]];
+			const float *n2 = bone_octahedral_solid_normals[bone_octahedral_wire_adjacent_face[i * 2 + 1]];
 			add_fancy_edge(vbo, pos_id, n1_id, n2_id, &v_idx, co1, co2, n1, n2);
 		}
 
@@ -799,22 +799,22 @@ Batch *DRW_cache_bone_point_get(void)
 
 		/* Vertices */
 		VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
-		VertexBuffer_allocate_data(vbo, (lat_res-1) * lon_res * 6);
+		VertexBuffer_allocate_data(vbo, (lat_res - 1) * lon_res * 6);
 
 		float lon = 0.0f;
-		for(int i = 0; i < lon_res; i++, lon += lon_inc) {
+		for (int i = 0; i < lon_res; i++, lon += lon_inc) {
 			float lat = 0.0f;
-			for(int j = 0; j < lat_res; j++, lat += lat_inc) {
+			for (int j = 0; j < lat_res; j++, lat += lat_inc) {
 				if (j != lat_res - 1) { /* Pole */
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat+lat_inc, lon+lon_inc);
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat+lat_inc, lon);
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,         lon);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat + lat_inc, lon + lon_inc);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat + lat_inc, lon);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,           lon);
 				}
 
 				if (j != 0) { /* Pole */
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,         lon+lon_inc);
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat+lat_inc, lon+lon_inc);
-					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,         lon);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,           lon + lon_inc);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat + lat_inc, lon + lon_inc);
+					add_lat_lon_vert(vbo, pos_id, nor_id, &v_idx, rad, lat,           lon);
 				}
 			}
 		}
@@ -910,4 +910,4 @@ struct Batch *DRW_cache_surface_material_get(Object *ob, int nr) {
 	/* TODO */
 	return NULL;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ccd3198de4f..f481965678c 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file blender/draw/draw_manager.c
+/** \file blender/draw/intern/draw_manager.c
  *  \ingroup draw
  */
 
@@ -160,7 +160,7 @@ enum {
 };
 
 /* Render State */
-static struct DRWGlobalState{
+static struct DRWGlobalState {
 	GPUShader *shader;
 	struct GPUFrameBuffer *default_framebuffer;
 	FramebufferList *fbl, *fbl_mode;
@@ -680,8 +680,10 @@ static void shgroup_dynamic_instance(DRWShadingGroup *shgroup)
 static void shgroup_dynamic_batch_from_calls(DRWShadingGroup *shgroup)
 {
 	if ((shgroup->interface->instance_vbo || shgroup->batch_geom) &&
-		(G.debug_value == 667))
+	    (G.debug_value == 667))
+	{
 		return;
+	}
 
 	if (shgroup->type == DRW_SHG_INSTANCE) {
 		shgroup_dynamic_instance(shgroup);
@@ -924,7 +926,8 @@ static void set_state(short flag)
 
 	/* Backface Culling */
 	if (flag & DRW_STATE_CULL_BACK ||
-	    flag & DRW_STATE_CULL_FRONT) {
+	    flag & DRW_STATE_CULL_FRONT)
+	{
 
 		glEnable(GL_CULL_FACE);
 
@@ -939,7 +942,8 @@ static void set_state(short flag)
 
 	/* Depht Test */
 	if (flag & DRW_STATE_DEPTH_LESS ||
-	    flag & DRW_STATE_DEPTH_EQUAL) {
+	    flag & DRW_STATE_DEPTH_EQUAL)
+	{
 
 		glEnable(GL_DEPTH_TEST);
 
@@ -1187,14 +1191,14 @@ void DRW_framebuffer_init(struct GPUFrameBuffer **fb, int width, int height, DRW
 		int color_attachment = -1;
 		*fb = GPU_framebuffer_create();
 
-		for (int i = 0; i < texnbr; ++i)
-		{
+		for (int i = 0; i < texnbr; ++i) {
 			DRWFboTexture fbotex = textures[i];
 			
 			if (!*fbotex.tex) {
 				/* TODO refine to opengl formats */
 				if (fbotex.format == DRW_BUF_DEPTH_16 ||
-					fbotex.format == DRW_BUF_DEPTH_24) {
+				    fbotex.format == DRW_BUF_DEPTH_24)
+				{
 					*fbotex.tex = GPU_texture_create_depth(width, height, NULL);
 					GPU_texture_compare_mode(*fbotex.tex, false);
 					GPU_texture_filter_mode(*fbotex.tex, false);
diff --git a/source/blender/draw/intern/draw_mode_pass.c b/source/blender/draw/intern/draw_mode_pass.c
index 9e71de01070..043ac9573a3 100644
--- a/source/blender/draw/intern/draw_mode_pass.c
+++ b/source/blender/draw/intern/draw_mode_pass.c
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file blender/draw/draw_mode_pass.c
+/** \file blender/draw/intern/draw_mode_pass.c
  *  \ingroup draw
  */
 
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 9d8699d24ee..f3865a7a92f 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file blender/draw/draw_view.c
+/** \file blender/draw/intern/draw_view.c
  *  \ingroup draw
  *
  * Contains dynamic drawing using immediate mode
@@ -65,7 +65,7 @@ void DRW_draw_region_info(void)
 
 /* ************************* Grid ************************** */
 
-static void gridline_range(double x0, double dx, double max, int* first_out, int* count_out)
+static void gridline_range(double x0, double dx, double max, int *r_first, int *r_count)
 {
 	/* determine range of gridlines that appear in this Area -- similar calc but separate ranges for x & y
 	* x0 is gridline 0, the axis in screen space
@@ -75,12 +75,12 @@ static void gridline_range(double x0, double dx, double max, int* first_out, int
 	int last = (int)floor((max - x0) / dx);
 
 	if (first <= last) {
-		*first_out = first;
-		*count_out = last - first + 1;
+		*r_first = first;
+		*r_count = last - first + 1;
 	}
 	else {
-		*first_out = 0;
-		*count_out = 0;
+		*r_first = 0;
+		*r_count = 0;
 	}
 }
 
@@ -198,9 +198,9 @@ static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, const char **
 	glDepthMask(GL_FALSE);  /* disable write in zbuffer */
 #endif
 
-	VertexFormat* format = immVertexFormat();
-	unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
-	unsigned color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
+	VertexFormat *format = immVertexFormat();
+	unsigned int pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
+	unsigned int color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
 
 	immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
 
@@ -273,7 +273,7 @@ static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, const char **
 			}
 		}
 		else {
-			if (dx >(GRID_MIN_PX_D * 10.0)) {  /* start blending in */
+			if (dx > (GRID_MIN_PX_D * 10.0)) {  /* start blending in */
 				rv3d->gridview /= sublines_fl;
 				dx /= sublines;
 				if (dx > (GRID_MIN_PX_D * 10.0)) {  /* start blending in */
@@ -364,9 +364,9 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
 
 			unsigned char col_bg[3], col_grid_emphasise[3], col_grid_light[3];
 
-			VertexFormat* format = immVertexFormat();
-			unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
-			unsigned color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
+			VertexFormat *format = immVertexFormat();
+			unsigned int pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
+			unsigned int color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
 
 			immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR);
 
@@ -452,9 +452,9 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
 		if (show_axis_x || show_axis_y || show_axis_z) {
 			/* draw axis lines -- sometimes grid floor is off, other times we still need to draw the Z axis */
 
-			VertexFormat* format = immVertexFormat();
-			unsigned pos = add_attrib(format, "pos", COMP_F32, 3, KEEP_FLOAT);
-			unsigned color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
+			VertexFormat *format = immVertexFormat();
+			unsigned int pos = add_attrib(format, "pos", COMP_F32, 3, KEEP_FLOAT);
+			unsigned int color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
 
 			immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR);
 			immBegin(GL_LINES, (show_axis_x + show_axis_y + show_axis_z) * 2);
@@ -636,10 +636,10 @@ void DRW_draw_cursor(void)
 		const float f10 = 0.5f;
 		const float f20 = 1.0f;
 
-		VertexFormat* format = immVertexFormat();
-		unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
-		unsigned color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
-		unsigned wpos = add_attrib(format, "world_pos", COMP_F32, 3, KEEP_FLOAT);
+		VertexFormat *format = immVertexFormat();
+		unsigned int pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
+		unsigned int color = add_attrib(format, "color", COMP_U8, 3, NORMALIZE_INT_TO_FLOAT);
+		unsigned int wpos = add_attrib(format, "world_pos", COMP_F32, 3, KEEP_FLOAT);
 
 		/* XXX Using instance shader without instance */
 		immBindBuiltinProgram(GPU_SHADER_3D_SCREENSPACE_VARIYING_COLOR);
diff --git a/source/blender/draw/modes/edit_armature_mode.c b/source/blender/draw/modes/edit_armature_mode.c
index 016c392e515..e55a368c9be 100644
--- a/source/blender/draw/modes/edit_armature_mode.c
+++ b/source/blender/draw/modes/edit_armature_mode.c
@@ -33,7 +33,7 @@
 #include "edit_armature_mode.h"
 
 /* keep it under MAX_PASSES */
-typedef struct EDIT_ARMATURE_PassList{
+typedef struct EDIT_ARMATURE_PassList {
 	struct DRWPass *non_meshes_pass;
 	struct DRWPass *ob_center_pass;
 	struct DRWPass *wire_outline_pass;
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index ec19a466a13..d2299158e44 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -31,7 +31,7 @@
 #include "edit_mesh_mode.h"
 
 /* keep it under MAX_PASSES */
-typedef struct EDIT_MESH_PassList{
+typedef struct EDIT_MESH_PassList {
 	struct DRWPass *non_meshes_pass;
 	struct DRWPass *ob_center_pass;
 	struct DRWPass *wire_outline_pass;
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 811d1928336..e9fec871528 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -31,7 +31,7 @@
 #include "object_mode.h"
 
 /* keep it under MAX_PASSES */
-typedef struct OBJECT_PassList{
+typedef struct OBJECT_PassList {
 	struct DRWPass *non_meshes_pass;
 	struct DRWPass *ob_center_pass;
 	struct DRWPass *wire_outline_pass;