diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-05-21 09:34:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-21 09:34:20 +0300 |
commit | c13bf40ab1a3faf7b866598cdca92f2caae80fae (patch) | |
tree | 8b27e7925a82933e9894ba8ddef60c0758f68657 /source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl | |
parent | 0ff663b6fc1c403e680dc7c6ed7b420a7d54faa5 (diff) | |
parent | fcfb87def9378e874c9bb32638bd58ac5c06d19a (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl')
-rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl index 58becb03290..b77e168889f 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl @@ -15,4 +15,4 @@ void main() /* Make this fragment occlude any fragment that will try to * render over it in the normal passes. */ gl_FragDepth = 0.0; -}
\ No newline at end of file +} |