diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-16 01:29:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-16 01:30:05 +0300 |
| commit | 3e311fdcd17602ca74a332fda24ee43f89e7ecd2 (patch) | |
| tree | 497456a95255f5a31440c1480f4f1e1fb3c48253 /source/blender/draw | |
| parent | 73dd9c4d34aec6169ecac180429ec009124537a9 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/draw')
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 3b1c51cb8eb..78cf5558740 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1229,10 +1229,10 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T } if ((gpd->runtime.sbuffer_size >= 3) && - (gpd->runtime.sfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) && - ((gpd->runtime.sbuffer_sflag & GP_STROKE_NOFILL) == 0) && - ((brush->gpencil_settings->flag & GP_BRUSH_DISSABLE_LASSO) == 0) && - (gp_style->flag & GP_STYLE_FILL_SHOW)) + (gpd->runtime.sfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) && + ((gpd->runtime.sbuffer_sflag & GP_STROKE_NOFILL) == 0) && + ((brush->gpencil_settings->flag & GP_BRUSH_DISSABLE_LASSO) == 0) && + (gp_style->flag & GP_STYLE_FILL_SHOW)) { /* if not solid, fill is simulated with solid color */ if (gpd->runtime.bfill_style > 0) { @@ -1262,9 +1262,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T /* control points */ if ((overlay) && (gpd->runtime.tot_cp_points > 0) && - ((gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) && - ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) && - ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0)) + ((gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) && + ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) && + ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0)) { DRWShadingGroup *shgrp = DRW_shgroup_create( diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl index 3b99018cedd..748f69ab21a 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl @@ -57,7 +57,7 @@ bool is_equal(vec4 p1, vec4 p2) if ((x < limit) && (y < limit) && (z < limit)) { return true; } - + return false; } diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c index 06aafb547f9..f469ece6f18 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.c +++ b/source/blender/draw/intern/draw_cache_impl_curve.c @@ -990,7 +990,7 @@ void DRW_curve_batch_cache_create_requested(Object *ob) } if (DRW_vbo_requested(cache->tess.pos_nor) || - DRW_vbo_requested(cache->tess.uv)) + DRW_vbo_requested(cache->tess.uv)) { DRW_displist_vertbuf_create_pos_and_nor_and_uv_tess(lb, cache->tess.pos_nor, cache->tess.uv); } |