[Bf-blender-cvs] [1f1b638b403] master: Cleanup: clang-format

Antonioya noreply at git.blender.org
Thu Jun 13 13:43:14 CEST 2019


Commit: 1f1b638b4030bf2d3cef2142ed07ed5929df1444
Author: Antonioya
Date:   Thu Jun 13 13:43:07 2019 +0200
Branches: master
https://developer.blender.org/rB1f1b638b4030bf2d3cef2142ed07ed5929df1444

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 5fc0990baaa..3dc1f379f71 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -49,8 +49,7 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 mix_color)
       src_color = vec4(vec3(src_color.rgb / src_color.a), src_color.a);
       mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a);
 
-      outcolor = vec4(mix(src_color.rgb, mix_color.rgb, mix_color.a),
-                        src_color.a);
+      outcolor = vec4(mix(src_color.rgb, mix_color.rgb, mix_color.a), src_color.a);
       break;
     }
     case MODE_OVERLAY:



More information about the Bf-blender-cvs mailing list