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>2019-06-13 05:37:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-13 05:37:01 +0300
commit41acdac2de5813c4d6b75e12581903134a0fd078 (patch)
treecca636f90b4c4dc6cd4695d507dac49d76a04b73
parentbe1e61b09352498e570c2852e7cc7ccb0d20394d (diff)
Cleanup: clang-format
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
index 658c708ee19..009f58b8789 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -115,12 +115,11 @@ void main()
if (mode == MODE_REGULAR) {
if (stroke_color.a > 0) {
if (mix_color.a > 0) {
- /* premult */
+ /* premult */
stroke_color = vec4(vec3(stroke_color.rgb / stroke_color.a), stroke_color.a);
mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a);
- FragColor = vec4(mix(stroke_color.rgb, mix_color.rgb, mix_color.a),
- stroke_color.a);
+ FragColor = vec4(mix(stroke_color.rgb, mix_color.rgb, mix_color.a), stroke_color.a);
gl_FragDepth = mix_depth;
}
else {