Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-10-21 08:08:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-21 08:23:15 +0300
commit769b979abb1ed3876afcadc28953cdc1d7c8f516 (patch)
treef13c30fe6b4b629ffbbced256845776661d0f490 /source/blender/draw
parent34f2ed7f719c1e72aa21b0b923121a2f9dce84c5 (diff)
Cleanup: trailing space
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_cache_utils.c1
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl6
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl4
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl6
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl2
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl2
6 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index b254e771cc5..dec14b30e59 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -364,4 +364,3 @@ void DRW_gpencil_freecache(struct Object *ob)
}
}
}
-
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl
index 027048e3f5f..e59cbef3e5d 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl
@@ -42,11 +42,11 @@ void main()
/* round to avoid shift when add more samples */
dx = floor(dx) + 1.0;
dy = floor(dy) + 1.0;
-
+
/* apply blurring, using a 9-tap filter with predefined gaussian weights */
/* depth (get the value of the surrounding pixels) */
float outdepth = 0.0;
-
+
outdepth += get_zdepth(ivec2(uv.x - 1.0 * dx, uv.y + 1.0 * dy)) * 0.0947416;
outdepth += get_zdepth(ivec2(uv.x - 0.0 * dx, uv.y + 1.0 * dy)) * 0.118318;
outdepth += get_zdepth(ivec2(uv.x + 1.0 * dx, uv.y + 1.0 * dy)) * 0.0947416;
@@ -76,7 +76,7 @@ void main()
outcolor += texelFetch(strokeColor, ivec2(uv.x + 1.0 * dx, uv.y - 1.0 * dy), 0) * 0.0947416;
FragColor = clamp(outcolor, 0, 1.0);
-
+
/* discar extreme values */
if (outcolor.a < 0.02f) {
discard;
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl
index 237cdf15627..9cdcad3e486 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl
@@ -28,7 +28,7 @@ bool check_color(vec3 color_a, vec3 color_b)
/* need round the number to avoid precision errors */
if ((floor(color_a.r * 100) == floor(color_b.r * 100)) &&
(floor(color_a.g * 100) == floor(color_b.g * 100)) &&
- (floor(color_a.b * 100) == floor(color_b.b * 100)))
+ (floor(color_a.b * 100) == floor(color_b.b * 100)))
{
return true;
}
@@ -62,7 +62,7 @@ void main()
else {
discard;
}
-
+
gl_FragDepth = stroke_depth;
FragColor = vec4(glow_color.rgb, 1.0);
}
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl
index 010c4ef4a88..5bff7a20523 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl
@@ -30,17 +30,17 @@ void main()
outcolor = src_pixel;
}
}
-
+
if (src_pixel.a < glow_pixel.a) {
gl_FragDepth = glow_depth;
}
else {
gl_FragDepth = stroke_depth;
}
-
+
if (outcolor.a < 0.001) {
discard;
}
-
+
FragColor = outcolor;
}
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl
index df5248c7791..3dbab0297c4 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl
@@ -38,6 +38,6 @@ void main()
FragColor = outcolor;
gl_FragDepth = stroke_depth;
- if (outcolor.a < 0.02f)
+ if (outcolor.a < 0.02f)
discard;
}
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
index 8b1ffb5199d..d6bcffb12c6 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
@@ -100,4 +100,4 @@ void main()
# endif
}
-#endif \ No newline at end of file
+#endif