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-05 08:01:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-05 08:01:58 +0300
commitf36f0293210128666f29f0be5c2dfb38bb3421e2 (patch)
treed9b969a54e4f63891e7da266d96462b895c9fe3f /source/blender/draw/engines/gpencil/shaders
parent402bde39d135d2bbc314743f37f65693597c57b1 (diff)
Cleanup: style
Diffstat (limited to 'source/blender/draw/engines/gpencil/shaders')
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl12
-rw-r--r--source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl2
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
index d370f1fdcb5..8bb92f69723 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl
@@ -65,18 +65,18 @@ void main()
vec2 rotpoint = vec2((tpos.x * cosv) - (tpos.y * sinv), (tpos.x * sinv) + (tpos.y * cosv));
tpos = rotpoint;
}
-
+
/* apply offset */
tpos = vec2(tpos.x - dx, tpos.y - dy);
-
+
/* apply scale */
tpos.x *= 1.0 / scale[0];
tpos.y *= 1.0 / scale[1];
-
+
/* back to original coords system */
vec2 texpos = tpos + loc2d;
-
- /* wave */
+
+ /* wave */
if (orientation == HORIZONTAL) {
float pval = (uv.x * M_PI) / Viewport[0];
texpos.y += amplitude * sin((period * pval) + phase);
@@ -85,7 +85,7 @@ void main()
float pval = (uv.y * M_PI) / Viewport[1];
texpos.x += amplitude * sin((period * pval) + phase);
}
-
+
vec4 src_pixel = texelFetch(strokeColor, ivec2(texpos.x, texpos.y), 0);
/* is transparent */
if (src_pixel.a == 0.0f) {
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
index 633dcf1fd63..0343d0d42fc 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl
@@ -26,7 +26,7 @@ void main()
outcolor = shadow_pixel;
outdepth = shadow_depth;
}
-
+
gl_FragDepth = outdepth;
FragColor = outcolor;
}