diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-26 06:31:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-26 06:31:48 +0300 |
| commit | 186bd4d87ba14cfe4f23ed11be1166b42dd0449e (patch) | |
| tree | fc405b92de6c4989e20bd709e96813eb9ea24bc5 /source/blender/draw | |
| parent | 1de11c38d4dae96c57d5580a77631093b3e8c33a (diff) | |
Cleanup: indentation, trailing space
Diffstat (limited to 'source/blender/draw')
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index d505095a393..7b2cf0bfe65 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -618,9 +618,9 @@ static void gpencil_add_stroke_vertexdata( tcolor[3] = gps->runtime.tmp_stroke_rgba[3] * opacity; if ((use_wiremode) && - ((gps->runtime.tmp_stroke_rgba[3] < GPENCIL_ALPHA_OPACITY_THRESH) || - (((gp_style->flag & GP_STYLE_STROKE_SHOW) == 0))) && - (gps->runtime.tmp_fill_rgba[3] >= GPENCIL_ALPHA_OPACITY_THRESH)) + ((gps->runtime.tmp_stroke_rgba[3] < GPENCIL_ALPHA_OPACITY_THRESH) || + (((gp_style->flag & GP_STYLE_STROKE_SHOW) == 0))) && + (gps->runtime.tmp_fill_rgba[3] >= GPENCIL_ALPHA_OPACITY_THRESH)) { interp_v3_v3v3(tcolor, gps->runtime.tmp_fill_rgba, tintcolor, tintcolor[3]); tcolor[3] = gps->runtime.tmp_fill_rgba[3] * opacity; @@ -827,7 +827,7 @@ static void gpencil_draw_strokes( /* fill */ if ((gp_style->flag & GP_STYLE_FILL_SHOW) && (!stl->storage->simplify_fill) && - (stl->storage->shading_type != OB_WIRE) && + (stl->storage->shading_type != OB_WIRE) && ((gps->flag & GP_STROKE_NOFILL) == 0)) { gpencil_add_fill_vertexdata( @@ -838,7 +838,7 @@ static void gpencil_draw_strokes( /* No fill strokes, must show stroke always */ if (((gp_style->flag & GP_STYLE_STROKE_SHOW) || (gps->flag & GP_STROKE_NOFILL) || - (stl->storage->shading_type == OB_WIRE)) && + (stl->storage->shading_type == OB_WIRE)) && ((gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gpl->blend_mode == eGplBlendMode_Normal))) { @@ -925,8 +925,8 @@ static void gpencil_draw_onion_strokes( /* stroke */ gpencil_add_stroke_vertexdata( cache, ob, gpl, gpf, gps, opacity, tintcolor, - true, custonion, - (stl->storage->shading_type == OB_WIRE)); + true, custonion, + (stl->storage->shading_type == OB_WIRE)); stl->storage->shgroup_id++; } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index d2a7ca5a87b..a93c9377d98 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -523,7 +523,7 @@ void GPENCIL_cache_init(void *vedata) /* create effects passes */ if ((!stl->storage->simplify_fx) && - (stl->storage->shading_type != OB_WIRE)) + (stl->storage->shading_type != OB_WIRE)) { GPENCIL_create_fx_passes(psl); } @@ -552,8 +552,8 @@ static void gpencil_add_draw_data(void *vedata, Object *ob) /* FX passses */ cache_ob->has_fx = false; if ((!stl->storage->simplify_fx) && - (stl->storage->shading_type != OB_WIRE) && - (BKE_shaderfx_has_gpencil(ob))) + (stl->storage->shading_type != OB_WIRE) && + (BKE_shaderfx_has_gpencil(ob))) { cache_ob->has_fx = true; if ((!stl->storage->simplify_fx) && (!is_multiedit)) { diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl index 29803c7b3e2..ac38506efd1 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl @@ -154,5 +154,5 @@ void main() else { gl_FragDepth = 0.000001; } - + } |