diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:04:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:16:49 +0300 |
| commit | 01f576e87b54159bb360cf1ed85518bb75231107 (patch) | |
| tree | 0ac38f90154f8ee08a35fb88c5cf742403bbcb3c /source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl | |
| parent | 469408de725353b461d073097d88b6b810c16c38 (diff) | |
| parent | 799779d432309e518922d23e3a1d1b5baaece71d (diff) | |
Merge branch 'master' into blender2.8
The Eevee AO node supports the new Normal socket, but ignores Distance,
Samples, Inside and Only Local settings.
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl')
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl index ac1dd071a29..69c96eed3f3 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl @@ -479,4 +479,4 @@ void CLOSURE_NAME( #ifdef CLOSURE_SUBSURFACE #undef CLOSURE_SUBSURFACE -#endif
\ No newline at end of file +#endif |