diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-20 09:52:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-20 09:52:56 +0300 |
| commit | 12eb29fe355bc17dacf094e8e9d6edc1d8b877f0 (patch) | |
| tree | b4297f5992c2263dbc3f986f20bc3edad99af4b0 /source/blender/draw | |
| parent | 96a3a628613bfd592aea5fcdfbb196bb61dfacb7 (diff) | |
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/modes/pose_mode.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index a9c2941eb22..1dcc8d0ec6d 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -339,7 +339,8 @@ void workbench_materials_engine_init(WORKBENCH_Data *vedata) if (NORMAL_ENCODING_ENABLED()) { e_data.normal_buffer_tx = DRW_texture_pool_query_2D(size[0], size[1], GPU_RG16, &draw_engine_workbench_solid); - } else { + } + else { e_data.normal_buffer_tx = DRW_texture_pool_query_2D(size[0], size[1], GPU_RGBA32F, &draw_engine_workbench_solid); } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 3e7790b421f..eab79eb16ad 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -239,7 +239,7 @@ bool DRW_check_psys_visible_within_active_context( } if ((part->childtype == 0) && (psys->flag & PSYS_HAIR_DYNAMICS && - psys->pointcache->flag & PTCACHE_BAKED)==0) + psys->pointcache->flag & PTCACHE_BAKED) == 0) { return false; } diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 78ac96e41b2..acf9938ad73 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -108,7 +108,8 @@ void drw_state_set(DRWState state) DRW_STATE_WRITE_STENCIL | DRW_STATE_WRITE_STENCIL_SHADOW)) { if ((state & (DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR | - DRW_STATE_WRITE_STENCIL | DRW_STATE_WRITE_STENCIL_SHADOW)) != 0) { + DRW_STATE_WRITE_STENCIL | DRW_STATE_WRITE_STENCIL_SHADOW)) != 0) + { glDisable(GL_RASTERIZER_DISCARD); } else { diff --git a/source/blender/draw/modes/pose_mode.c b/source/blender/draw/modes/pose_mode.c index f138704cced..464c56f4761 100644 --- a/source/blender/draw/modes/pose_mode.c +++ b/source/blender/draw/modes/pose_mode.c @@ -250,7 +250,7 @@ static void POSE_draw_scene(void *vedata) return; } - if(bone_selection_overlay) { + if (bone_selection_overlay) { GPU_framebuffer_bind(dfbl->default_fb); DRW_draw_pass(psl->bone_selection); GPU_framebuffer_bind(dfbl->depth_only_fb); |