From 815a9df70cf1ed1a3dfd7c26869354b07de34404 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 12 Mar 2019 08:16:55 +1100 Subject: Cleanup: trailing space --- .../blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl | 4 ++-- .../blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl | 4 ++-- .../blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl | 4 ++-- .../blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl | 2 +- .../draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl | 8 ++++---- source/blender/editors/gpencil/gpencil_primitive.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source') 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 f0878c8bc89..7f3bbf17222 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl @@ -170,10 +170,10 @@ void main() if (shading_type[0] == OB_WIRE) { fragColor = wire_color; } - + /* for solid override color */ if (shading_type[0] == OB_SOLID) { - if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { + if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { fragColor = wire_color; } if (viewport_xray == 1) { diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl index b367d15f1f9..2606bbf878e 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl @@ -40,7 +40,7 @@ void main() float size = (ProjectionMatrix[3][3] == 0.0) ? (thickness / (gl_Position.z * defaultpixsize)) : (thickness / defaultpixsize); finalThickness = max(size * objscale, 4.0); /* minimum 4 pixels */ } - + /* for wireframe override size and color */ if (shading_type[0] == OB_WIRE) { finalThickness = 2.0; @@ -48,7 +48,7 @@ void main() } /* for solid override color */ if (shading_type[0] == OB_SOLID) { - if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { + if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { finalColor = wire_color; } if (viewport_xray == 1) { diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl index dad482bfa23..80fa899b13a 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl @@ -31,7 +31,7 @@ void main() if (color_type == GPENCIL_COLOR_SOLID) { fragColor = tColor; } - + /* texture for endcaps */ vec4 text_color; if (uvfac[1] == ENDCAP) { @@ -40,7 +40,7 @@ void main() else { text_color = texture2D(myTexture, mTexCoord); } - + /* texture */ if (color_type == GPENCIL_COLOR_TEXTURE) { fragColor = text_color; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl index 3c6768dd483..62740f37ae8 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl @@ -48,7 +48,7 @@ void main(void) } /* for solid override color */ if (shading_type[0] == OB_SOLID) { - if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { + if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { finalColor = wire_color; } if (viewport_xray == 1) { diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl index a68c17031ff..a32fd87a446 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl @@ -30,15 +30,15 @@ float linearrgb_to_srgb(float c) bool check_borders(ivec2 uv, int size) { - for (int x = -size; x <= size; x++) { - for (int y = -size; y <= size; y++) { + for (int x = -size; x <= size; x++) { + for (int y = -size; y <= size; y++) { vec4 stroke_color = texelFetch(strokeColor, ivec2(uv.x + x, uv.y + y), 0).rgba; if (stroke_color.a > 0) { return true; } } } - + return false; } @@ -62,7 +62,7 @@ void main() FragColor = clamp(stroke_color, 0.0, 1.0); gl_FragDepth = clamp(stroke_depth, 0.0, 1.0); - + if (do_select == 1) { if (stroke_color.a == 0) { if (check_borders(uv, 2)) { diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index a7f0d2c47f4..3a2347d9177 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -531,7 +531,7 @@ static void gp_primitive_line(tGPDprimitive *tgpi, tGPspoint *points2D) interp_v2_v2v2(&p2d->x, tgpi->start, tgpi->end, a); a += step; } - + float color[4]; UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); -- cgit v1.2.3