diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/draw/modes/shaders/common_fxaa_lib.glsl | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/modes/shaders/common_fxaa_lib.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/common_fxaa_lib.glsl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/draw/modes/shaders/common_fxaa_lib.glsl b/source/blender/draw/modes/shaders/common_fxaa_lib.glsl index 8158437b943..236ac5c67f0 100644 --- a/source/blender/draw/modes/shaders/common_fxaa_lib.glsl +++ b/source/blender/draw/modes/shaders/common_fxaa_lib.glsl @@ -675,4 +675,3 @@ vec4 FxaaPixelShader( return vec4(FxaaTexTop(tex, posM).xyz, lumaM); } /*==========================================================================*/ - |