diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-07 07:57:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-07 07:57:14 +0300 |
commit | adfbf276a15346c38cc6b7652191c005b9a3ae9b (patch) | |
tree | 6f7d27e9adb8c15d3021c8276d6c577a0e5746ba /source/blender/draw | |
parent | 37b457221ec77b485b6e65537ac2db7fd8107e6d (diff) |
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/basic/basic_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_effects.c | 8 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightprobes.c | 14 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lights.c | 42 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lut.h | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 20 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/external/external_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.c | 28 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_profiling.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 8 |
13 files changed, 68 insertions, 70 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index fbd8f20caf7..16678beec4d 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -19,7 +19,7 @@ * */ -/** \file basic_engine.h +/** \file basic_engine.c * \ingroup draw_engine * * Simple engine for drawing color and/or depth. diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 5d2c9303865..13d141bf4bf 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -1189,7 +1189,7 @@ void EEVEE_effects_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) /* This create an empty batch of N triangles to be positioned * by the vertex shader 0.4ms against 6ms with instancing */ const float *viewport_size = DRW_viewport_size_get(); - const int sprite_ct = ((int)viewport_size[0]/2) * ((int)viewport_size[1]/2); /* brackets matters */ + const int sprite_ct = ((int)viewport_size[0] / 2) * ((int)viewport_size[1] / 2); /* brackets matters */ grp = DRW_shgroup_empty_tri_batch_create(e_data.dof_scatter_sh, psl->dof_scatter, sprite_ct); DRW_shgroup_uniform_buffer(grp, "colorBuffer", &effects->unf_source_buffer); @@ -1577,7 +1577,7 @@ void EEVEE_draw_effects(EEVEE_Data *vedata) last = txl->bloom_downsample[0]; for (int i = 1; i < effects->bloom_iteration_ct; ++i) { - copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i-1]); + copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i - 1]); effects->unf_source_buffer = last; DRW_framebuffer_bind(fbl->bloom_down_fb[i]); @@ -1646,8 +1646,8 @@ void EEVEE_draw_effects(EEVEE_Data *vedata) SWAP_DOUBLE_BUFFERS(); if (!stl->g_data->valid_double_buffer && - ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0) && - (DRW_state_is_image_render() == false)) + ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0) && + (DRW_state_is_image_render() == false)) { /* If history buffer is not valid request another frame. * This fix black reflections on area resize. */ diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 4928abe3b01..a8178f86a7e 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -19,7 +19,7 @@ * */ -/** \file eevee_lights.c +/** \file eevee_lightprobes.c * \ingroup DNA */ @@ -36,8 +36,6 @@ #include "ED_screen.h" -#include "DRW_render.h" - #include "GPU_material.h" #include "GPU_texture.h" #include "GPU_glew.h" @@ -473,7 +471,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData *sldata, Object *ob) /* Step 1 find all lamps in the scene and setup them */ if ((probe->type == LIGHTPROBE_TYPE_CUBE && pinfo->num_cube >= MAX_PROBE) || - (probe->type == LIGHTPROBE_TYPE_GRID && pinfo->num_grid >= MAX_PROBE)) + (probe->type == LIGHTPROBE_TYPE_GRID && pinfo->num_grid >= MAX_PROBE)) { printf("Too much probes in the scene !!!\n"); return; @@ -669,7 +667,7 @@ static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata, EEVEE_PassLi /* Debug Display */ if (BKE_object_is_visible(ob) && - DRW_state_draw_support() && + DRW_state_draw_support() && (probe->flag & LIGHTPROBE_FLAG_SHOW_DATA)) { ped->probe_size = probe->data_draw_size * 0.1f; @@ -1347,9 +1345,9 @@ void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) else if (((((int)grid_loc[0] % current_stride) == 0) && (((int)grid_loc[1] % current_stride) == 0) && (((int)grid_loc[2] % current_stride) == 0)) && - !((((int)grid_loc[0] % prev_stride) == 0) && - (((int)grid_loc[1] % prev_stride) == 0) && - (((int)grid_loc[2] % prev_stride) == 0))) + !((((int)grid_loc[0] % prev_stride) == 0) && + (((int)grid_loc[1] % prev_stride) == 0) && + (((int)grid_loc[2] % prev_stride) == 0))) { valid_cell = true; } diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 8138b9a0ffd..1fa5aae4492 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -128,8 +128,8 @@ void EEVEE_lights_init(EEVEE_SceneLayerData *sldata) EEVEE_LampsInfo *linfo = sldata->lamps; if ((linfo->shadow_size != sh_size) || - (linfo->shadow_method != sh_method) || - (linfo->shadow_high_bitdepth != sh_high_bitdepth)) + (linfo->shadow_method != sh_method) || + (linfo->shadow_high_bitdepth != sh_high_bitdepth)) { BLI_assert((sh_size > 0) && (sh_size <= 8192)); DRW_TEXTURE_FREE_SAFE(sldata->shadow_pool); @@ -242,7 +242,7 @@ void EEVEE_lights_cache_add(EEVEE_SceneLayerData *sldata, Object *ob) MEM_SAFE_FREE(led->storage); if (la->mode & (LA_SHAD_BUF | LA_SHAD_RAY)) { - if (la->type == LA_SUN) { + if (la->type == LA_SUN) { int sh_nbr = 1; /* TODO : MSM */ int cascade_nbr = MAX_CASCADE_NUM; /* TODO : Custom cascade number */ @@ -463,12 +463,12 @@ static void eevee_light_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngi /* Make illumination power constant */ if (la->type == LA_AREA) { - power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) /* 1/(w*h*Pi) */ - * 80.0f; /* XXX : Empirical, Fit cycles power */ + power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) * /* 1/(w*h*Pi) */ + 80.0f; /* XXX : Empirical, Fit cycles power */ } else if (la->type == LA_SPOT || la->type == LA_LOCAL) { - power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) /* 1/(4*r²*Pi²) */ - * M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */ + power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) * /* 1/(4*r²*Pi²) */ + M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */ /* for point lights (a.k.a radius == 0.0) */ // power = M_PI * M_PI * 0.78; /* XXX : Empirical, Fit cycles power */ @@ -525,7 +525,7 @@ static void frustum_min_bounding_sphere(const float corners[8][4], float r_cente /* compute the bounding box */ INIT_MINMAX(minvec, maxvec); - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 8; ++i) { minmax_v3v3_v3(minvec, maxvec, corners[i]); } @@ -542,7 +542,7 @@ static void frustum_min_bounding_sphere(const float corners[8][4], float r_cente /* Search the largest distance between the sphere center * and the front plane corners. */ for (int i = 0; i < 4; ++i) { - float rad = len_v3v3(corners[4+i], r_center); + float rad = len_v3v3(corners[4 + i], r_center); if (rad > *r_radius) { *r_radius = rad; } @@ -648,11 +648,11 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE else { cascade_data->split_start[c] = linear_split; } - cascade_data->split_end[c-1] = cascade_data->split_start[c]; + cascade_data->split_end[c - 1] = cascade_data->split_start[c]; /* Add some overlap for smooth transition */ - cascade_data->split_start[c] = LERP(la->cascade_fade, cascade_data->split_end[c-1], - (c > 1) ? cascade_data->split_end[c-2] : cascade_data->split_start[0]); + cascade_data->split_start[c] = LERP(la->cascade_fade, cascade_data->split_end[c - 1], + (c > 1) ? cascade_data->split_end[c - 2] : cascade_data->split_start[0]); /* NDC Space */ { @@ -667,20 +667,20 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE } { - float p[4] = {1.0f, 1.0f, cascade_data->split_end[c-1], 1.0f}; + float p[4] = {1.0f, 1.0f, cascade_data->split_end[c - 1], 1.0f}; /* TODO: we don't need full m4 multiply here */ mul_m4_v4(viewprojmat, p); - splits_end_ndc[c-1] = p[2]; + splits_end_ndc[c - 1] = p[2]; if (is_persp) { - splits_end_ndc[c-1] /= p[3]; + splits_end_ndc[c - 1] /= p[3]; } } } /* Set last cascade split fade distance into the first split_start. */ - float prev_split = (cascade_nbr > 1) ? cascade_data->split_end[cascade_nbr-2] : cascade_data->split_start[0]; - cascade_data->split_start[0] = LERP(la->cascade_fade, cascade_data->split_end[cascade_nbr-1], prev_split); + float prev_split = (cascade_nbr > 1) ? cascade_data->split_end[cascade_nbr - 2] : cascade_data->split_start[0]; + cascade_data->split_start[0] = LERP(la->cascade_fade, cascade_data->split_end[cascade_nbr - 1], prev_split); /* For each cascade */ for (int c = 0; c < cascade_nbr; ++c) { @@ -699,7 +699,7 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE }; /* Transform them into world space */ - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 8; ++i) { mul_m4_v4(persinv, corners[i]); mul_v3_fl(corners[i], 1.0f / corners[i][3]); corners[i][3] = 1.0f; @@ -712,7 +712,7 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE normalize_v3(viewmat[1]); normalize_v3(viewmat[2]); - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 8; ++i) { mul_m4_v4(viewmat, corners[i]); } @@ -779,8 +779,8 @@ static bool cube_bbox_intersect(const float cube_center[3], float cube_half_dim, minmax_v3v3_v3(min, max, vec); } - if (MAX3(max[0], max[1], max[2]) < -cube_half_dim) return false; - if (MIN3(min[0], min[1], min[2]) > cube_half_dim) return false; + if (MAX3(max[0], max[1], max[2]) < -cube_half_dim) return false; + if (MIN3(min[0], min[1], min[2]) > cube_half_dim) return false; return true; } diff --git a/source/blender/draw/engines/eevee/eevee_lut.h b/source/blender/draw/engines/eevee/eevee_lut.h index 37306dbc87a..d706110351e 100644 --- a/source/blender/draw/engines/eevee/eevee_lut.h +++ b/source/blender/draw/engines/eevee/eevee_lut.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file eeveee_lut.h +/** \file eevee_lut.h * \ingroup gpu */ diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 0073d975507..91bdda39876 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -233,7 +233,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h) DRW_framebuffer_read_data(0, 0, w, h, 3, 0, data); - #if 1 +#if 1 fprintf(f, "\t{\n\t\t"); for (int i = 0; i < w*h * 3; i+=3) { fprintf(f, "%ff,", data[i]); @@ -241,7 +241,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h) else fprintf(f, " "); } fprintf(f, "\n\t},\n"); - #else +#else for (int i = 0; i < w*h * 3; i+=3) { if (data[i] < 0.01) printf(" "); else if (data[i] < 0.3) printf("."); @@ -250,7 +250,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h) else printf("#"); if ((i/3+1) % 64 == 0) printf("\n"); } - #endif +#endif } while (roughness < 1.0f); fprintf(f, "\n};\n"); @@ -445,8 +445,8 @@ void EEVEE_update_util_texture(float offset) /* Copy bsdf_split_sum_ggx into 2nd layer red and green channels. Copy ltc_mag_ggx into 2nd layer blue channel. */ for (int i = 0; i < 64 * 64; i++) { - texels_layer[i][0] = bsdf_split_sum_ggx[i*2 + 0]; - texels_layer[i][1] = bsdf_split_sum_ggx[i*2 + 1]; + texels_layer[i][0] = bsdf_split_sum_ggx[i * 2 + 0]; + texels_layer[i][1] = bsdf_split_sum_ggx[i * 2 + 1]; texels_layer[i][2] = ltc_mag_ggx[i]; } texels_layer += 64 * 64; @@ -467,10 +467,10 @@ void EEVEE_update_util_texture(float offset) /* Copy Refraction GGX LUT in layer 4 - 20 */ for (int j = 0; j < 16; ++j) { for (int i = 0; i < 64 * 64; i++) { - texels_layer[i][0] = btdf_split_sum_ggx[j*2][i]; - texels_layer[i][1] = btdf_split_sum_ggx[j*2][i]; - texels_layer[i][2] = btdf_split_sum_ggx[j*2][i]; - texels_layer[i][3] = btdf_split_sum_ggx[j*2][i]; + texels_layer[i][0] = btdf_split_sum_ggx[j * 2][i]; + texels_layer[i][1] = btdf_split_sum_ggx[j * 2][i]; + texels_layer[i][2] = btdf_split_sum_ggx[j * 2][i]; + texels_layer[i][3] = btdf_split_sum_ggx[j * 2][i]; } texels_layer += 64 * 64; } @@ -933,7 +933,7 @@ void EEVEE_materials_cache_init(EEVEE_Data *vedata) } \ } while (0) -typedef struct EeveeMaterialShadingGroups{ +typedef struct EeveeMaterialShadingGroups { struct DRWShadingGroup *shading_grp; struct DRWShadingGroup *depth_grp; struct DRWShadingGroup *depth_clip_grp; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 9d93097b7fd..45dabc37e06 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -159,7 +159,7 @@ typedef struct EEVEE_FramebufferList { struct GPUFrameBuffer *effect_fb; struct GPUFrameBuffer *bloom_blit_fb; struct GPUFrameBuffer *bloom_down_fb[MAX_BLOOM_STEP]; - struct GPUFrameBuffer *bloom_accum_fb[MAX_BLOOM_STEP-1]; + struct GPUFrameBuffer *bloom_accum_fb[MAX_BLOOM_STEP - 1]; struct GPUFrameBuffer *dof_down_fb; struct GPUFrameBuffer *dof_scatter_far_fb; struct GPUFrameBuffer *dof_scatter_near_fb; @@ -184,7 +184,7 @@ typedef struct EEVEE_TextureList { struct GPUTexture *dof_far_blur; /* R16_G16_B16_A16 */ struct GPUTexture *bloom_blit; /* R16_G16_B16 */ struct GPUTexture *bloom_downsample[MAX_BLOOM_STEP]; /* R16_G16_B16 */ - struct GPUTexture *bloom_upsample[MAX_BLOOM_STEP-1]; /* R16_G16_B16 */ + struct GPUTexture *bloom_upsample[MAX_BLOOM_STEP - 1]; /* R16_G16_B16 */ struct GPUTexture *ssr_normal_input; struct GPUTexture *ssr_specrough_input; struct GPUTexture *refract_color; diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index e765a0fe3a8..f4b38b7ebbf 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -19,7 +19,7 @@ * */ -/** \file external_engine.h +/** \file external_engine.c * \ingroup draw_engine * * Base engine for external render engines. diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 8bf7aff555e..13df65cf741 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -250,7 +250,7 @@ Gwn_Batch *DRW_cache_fullscreen_quad_get(void) Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format); GWN_vertbuf_data_alloc(vbo, 3); - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < 3; ++i) { GWN_vertbuf_attr_set(vbo, attr_id.pos, i, pos[i]); GWN_vertbuf_attr_set(vbo, attr_id.uvs, i, uvs[i]); } @@ -279,7 +279,7 @@ Gwn_Batch *DRW_cache_quad_get(void) Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format); GWN_vertbuf_data_alloc(vbo, 4); - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { GWN_vertbuf_attr_set(vbo, attr_id.pos, i, pos[i]); GWN_vertbuf_attr_set(vbo, attr_id.uvs, i, uvs[i]); } @@ -391,7 +391,7 @@ Gwn_Batch *DRW_cache_square_get(void) for (int i = 0; i < 4; i++) { GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2, p[i % 4]); - GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2 + 1, p[(i+1) % 4]); + GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2 + 1, p[(i + 1) % 4]); } SHC.drw_square = GWN_batch_create_ex(GWN_PRIM_LINES, vbo, NULL, GWN_BATCH_OWNS_VBO); @@ -1196,8 +1196,8 @@ Gwn_Batch *DRW_cache_lamp_spot_get(void) GWN_vertbuf_attr_set(vbo, attr_id.n1, i * 4, n[(i) % NSEGMENTS]); GWN_vertbuf_attr_set(vbo, attr_id.n1, i * 4 + 1, n[(i) % NSEGMENTS]); - GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4, n[(i+1) % NSEGMENTS]); - GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 1, n[(i+1) % NSEGMENTS]); + GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4, n[(i + 1) % NSEGMENTS]); + GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 1, n[(i + 1) % NSEGMENTS]); /* end ring */ v[0] = cv[0], v[1] = cv[1], v[2] = -1.0f; @@ -1245,8 +1245,8 @@ Gwn_Batch *DRW_cache_lamp_spot_square_get(void) GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[0]); GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[i]); - GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4)+1]); - GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i+1) % 4)+1]); + GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4) + 1]); + GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i + 1) % 4) + 1]); } SHC.drw_lamp_spot_square = GWN_batch_create_ex(GWN_PRIM_LINES, vbo, NULL, GWN_BATCH_OWNS_VBO); @@ -1351,7 +1351,7 @@ Gwn_Batch *DRW_cache_lightprobe_cube_get(void) Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format); GWN_vertbuf_data_alloc(vbo, (6 + 3) * 2); - for (int i = 0; i < 6; ++i) { + for (int i = 0; i < 6; ++i) { GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[i]); GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[(i + 1) % 6]); } @@ -1396,7 +1396,7 @@ Gwn_Batch *DRW_cache_lightprobe_grid_get(void) Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format); GWN_vertbuf_data_alloc(vbo, (6 * 2 + 3) * 2); - for (int i = 0; i < 6; ++i) { + for (int i = 0; i < 6; ++i) { float tmp_v1[3], tmp_v2[3], tmp_tr[3]; copy_v3_v3(tmp_v1, v[i]); copy_v3_v3(tmp_v2, v[(i + 1) % 6]); @@ -1449,7 +1449,7 @@ Gwn_Batch *DRW_cache_lightprobe_planar_get(void) Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format); GWN_vertbuf_data_alloc(vbo, 4 * 2); - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[i]); GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[(i + 1) % 4]); } @@ -1623,7 +1623,7 @@ static const unsigned int bone_box_solid_tris[12][3] = { /* aligned with bone_octahedral_solid_tris */ static const float bone_box_solid_normals[12][3] = { { 0.0f, -1.0f, 0.0f}, - { 0.0f, -1.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, @@ -1782,10 +1782,10 @@ Gwn_Batch *DRW_cache_bone_envelope_solid_get(void) float co1[3], co2[3], co3[3], co4[3]; for (int j = 0; j < lat_res; j++, lat += lat_inc) { - benv_lat_lon_to_co(lat , lon , co1); - benv_lat_lon_to_co(lat , lon + lon_inc, co2); + benv_lat_lon_to_co(lat, lon, co1); + benv_lat_lon_to_co(lat, lon + lon_inc, co2); benv_lat_lon_to_co(lat + lat_inc, lon + lon_inc, co3); - benv_lat_lon_to_co(lat + lat_inc, lon , co4); + benv_lat_lon_to_co(lat + lat_inc, lon, co4); if (j != 0) { /* At pole, n1 and n2 are identical. */ benv_add_tri(vbo, attr_id.pos, &v_idx, co1, co2, co3); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 6b3ef31f8dd..33d7cab285f 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -654,7 +654,7 @@ static MeshRenderData *mesh_render_data_create_ex( /* If tangent from orco is requested, decrement tangent_len */ int actual_tangent_len = (cd_lused[CD_TANGENT] & DM_TANGENT_MASK_ORCO) ? - rdata->cd.layers.tangent_len - 1 : rdata->cd.layers.tangent_len; + rdata->cd.layers.tangent_len - 1 : rdata->cd.layers.tangent_len; if (rdata->edit_bmesh) { BMEditMesh *em = rdata->edit_bmesh; BMesh *bm = em->bm; @@ -3107,7 +3107,7 @@ static Gwn_VertBuf *mesh_create_edge_pos_with_sel( const int edge_len = mesh_render_data_edges_len_get(rdata); - vbo= GWN_vertbuf_create_with_format(&format); + vbo = GWN_vertbuf_create_with_format(&format); const int vbo_len_capacity = edge_len * 2; int vbo_len_used = 0; diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 05b8f1657c4..1c83b813355 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1997,7 +1997,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) unit_m4(obmat); if (shgroup->type == DRW_SHG_INSTANCE && - (interface->instance_count > 0 || interface->instance_batch != NULL)) + (interface->instance_count > 0 || interface->instance_batch != NULL)) { GPU_SELECT_LOAD_IF_PICKSEL_LIST(&shgroup->calls); draw_geometry(shgroup, shgroup->instance_geom, obmat, shgroup->instance_data); diff --git a/source/blender/draw/intern/draw_manager_profiling.c b/source/blender/draw/intern/draw_manager_profiling.c index 2b913bcbb8d..f9fbbac2e2e 100644 --- a/source/blender/draw/intern/draw_manager_profiling.c +++ b/source/blender/draw/intern/draw_manager_profiling.c @@ -85,7 +85,7 @@ void DRW_stats_begin(void) DTP.timer_count = DTP.chunk_count * CHUNK_SIZE; DTP.timers = MEM_callocN(sizeof(DRWTimer) * DTP.timer_count, "DRWTimer stack"); } - else if(!DTP.is_recording && DTP.timers != NULL) { + else if (!DTP.is_recording && DTP.timers != NULL) { DRW_stats_free(); } diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 1ad77c9ac1b..db0ac5a1d11 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -49,7 +49,6 @@ #include "BKE_texture.h" #include "ED_view3d.h" -#include "ED_view3d.h" #include "GPU_shader.h" #include "GPU_texture.h" @@ -119,7 +118,7 @@ typedef struct OBJECT_Data { /* *********** STATIC *********** */ -typedef struct OBJECT_PrivateData{ +typedef struct OBJECT_PrivateData { /* Empties */ DRWShadingGroup *plain_axes; DRWShadingGroup *cube; @@ -487,7 +486,8 @@ static void OBJECT_engine_init(void *vedata) /* Persp : If camera is below floor plane, we switch clipping * Ortho : If eye vector is looking up, we switch clipping */ if (((winmat[3][3] == 0.0f) && (e_data.camera_pos[2] > 0.0f)) || - ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) { + ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) + { e_data.zpos_flag |= CLIP_ZPOS; e_data.zneg_flag |= CLIP_ZNEG; } @@ -1548,7 +1548,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl } if (prb->type == LIGHTPROBE_TYPE_GRID || - prb->attenuation_type == LIGHTPROBE_SHAPE_BOX) + prb->attenuation_type == LIGHTPROBE_SHAPE_BOX) { DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distgridinf, ob->obmat); DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distfalloff, ob->obmat); |