[Bf-blender-cvs] [41acdac2de5] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Thu Jun 13 04:38:31 CEST 2019
Commit: 41acdac2de5813c4d6b75e12581903134a0fd078
Author: Campbell Barton
Date: Thu Jun 13 12:37:01 2019 +1000
Branches: master
https://developer.blender.org/rB41acdac2de5813c4d6b75e12581903134a0fd078
Cleanup: clang-format
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
===================================================================
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 {
More information about the Bf-blender-cvs
mailing list