diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 08:47:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 08:47:03 +0300 |
commit | 1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (patch) | |
tree | f8a2465eac96414a4bfe1da812aed48c8e284cb8 /source/blender/draw/intern | |
parent | 5b45d32f3a4dfaa5f65e7ba59311863bf37c08da (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_instance_data.c | 8 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 10 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 16 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index ee73a2ba2c6..350d4a0c20d 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -297,13 +297,13 @@ static DRWInstanceData *drw_instance_data_create( BLI_assert(attrib_size > 0); /* Push to linked list. */ - if (idatalist->idata_head[attrib_size-1] == NULL) { - idatalist->idata_head[attrib_size-1] = idata; + if (idatalist->idata_head[attrib_size - 1] == NULL) { + idatalist->idata_head[attrib_size - 1] = idata; } else { - idatalist->idata_tail[attrib_size-1]->next = idata; + idatalist->idata_tail[attrib_size - 1]->next = idata; } - idatalist->idata_tail[attrib_size-1] = idata; + idatalist->idata_tail[attrib_size - 1] = idata; return idata; } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 66de79314b4..c99cd25df67 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -496,7 +496,7 @@ static void drw_viewport_var_init(void) void DRW_viewport_matrix_get(float mat[4][4], DRWViewportMatrixType type) { BLI_assert(type >= 0 && type < DRW_MAT_COUNT); - BLI_assert(((DST.override_mat & (1 << type)) != 0)|| DST.draw_ctx.rv3d != NULL); /* Can't use this in render mode. */ + BLI_assert(((DST.override_mat & (1 << type)) != 0) || DST.draw_ctx.rv3d != NULL); /* Can't use this in render mode. */ copy_m4_m4(mat, DST.view_data.matstate.mat[type]); } @@ -905,8 +905,8 @@ static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int dr case OB_SOLID: if (drawtype_solid == OB_LIGHTING_FLAT) { use_drw_engine(&draw_engine_workbench_solid_flat); - - } else if (drawtype_solid == OB_LIGHTING_STUDIO) { + } + else if (drawtype_solid == OB_LIGHTING_STUDIO) { use_drw_engine(&draw_engine_workbench_solid_studio); } @@ -1465,8 +1465,8 @@ static void draw_select_framebuffer_setup(const rcti *rect) /* If size mismatch recreate the texture. */ if ((g_select_buffer.texture_depth != NULL) && - ((GPU_texture_width(g_select_buffer.texture_depth) != BLI_rcti_size_x(rect)) || - (GPU_texture_height(g_select_buffer.texture_depth) != BLI_rcti_size_y(rect)))) + ((GPU_texture_width(g_select_buffer.texture_depth) != BLI_rcti_size_x(rect)) || + (GPU_texture_height(g_select_buffer.texture_depth) != BLI_rcti_size_y(rect)))) { GPU_texture_free(g_select_buffer.texture_depth); g_select_buffer.texture_depth = NULL; diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 3208e4e5017..ff29d7d7f3d 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -462,12 +462,12 @@ static void draw_clipping_setup_from_view(void) for (int p = 0; p < 6; p++) { int q, r; switch (p) { - case 0: q=1; r=2; break; - case 1: q=0; r=5; break; - case 2: q=1; r=5; break; - case 3: q=2; r=6; break; - case 4: q=0; r=3; break; - default: q=4; r=7; break; + case 0: q = 1; r = 2; break; + case 1: q = 0; r = 5; break; + case 2: q = 1; r = 5; break; + case 3: q = 2; r = 6; break; + case 4: q = 0; r = 3; break; + default: q = 4; r = 7; break; } if (DST.frontface == GL_CW) { SWAP(int, q, r); @@ -573,8 +573,8 @@ static void draw_clipping_setup_from_view(void) /* the big formula, it simplifies to (F-N)/(2(e-s)) for the symmetric case */ z = (F-N) / (2.0f * (e-s + c*(f-n))); - bsphere->center[0] = farcenter[0] * z/e; - bsphere->center[1] = farcenter[1] * z/e; + bsphere->center[0] = farcenter[0] * z / e; + bsphere->center[1] = farcenter[1] * z / e; bsphere->center[2] = z; bsphere->radius = len_v3v3(bsphere->center, farpoint); diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 814109ee1e9..a0c8cd4195a 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -90,7 +90,7 @@ static void drw_deferred_shader_free(DRWDeferredShader *dsh) static void drw_deferred_shader_queue_free(ListBase *queue) { DRWDeferredShader *dsh; - while((dsh = BLI_pophead(queue))) { + while ((dsh = BLI_pophead(queue))) { drw_deferred_shader_free(dsh); } } |