Commit: 46f659ba2d78b948d5a3a0e05567a5c71deb06db Author: Clément Foucault Date: Tue Jun 6 18:19:38 2017 +0200 Branches: blender2.8 https://developer.blender.org/rB46f659ba2d78b948d5a3a0e05567a5c71deb06db
Eevee: Fix shader compilation issue. =================================================================== M source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl M source/blender/draw/engines/eevee/shaders/ltc_lib.glsl =================================================================== 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 5ee0cb74894..1b68db8364c 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl @@ -8,10 +8,10 @@ uniform sampler2DArray probeCubes; uniform float lodMax; uniform vec3 shCoefs[9]; -#ifndef __UTIL_TEX__ -#define __UTIL_TEX__ +#ifndef UTIL_TEX +#define UTIL_TEX uniform sampler2DArray utilTex; -#endif /* __UTIL_TEX__ */ +#endif /* UTIL_TEX */ uniform sampler2DArray shadowCubes; uniform sampler2DArrayShadow shadowCascades; diff --git a/source/blender/draw/engines/eevee/shaders/ltc_lib.glsl b/source/blender/draw/engines/eevee/shaders/ltc_lib.glsl index cd16203703f..f296eedc3ee 100644 --- a/source/blender/draw/engines/eevee/shaders/ltc_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/ltc_lib.glsl @@ -2,10 +2,10 @@ #define USE_LTC -#ifndef __UTIL_TEX__ -#define __UTIL_TEX__ +#ifndef UTIL_TEX +#define UTIL_TEX uniform sampler2DArray utilTex; -#endif /* __UTIL_TEX__ */ +#endif /* UTIL_TEX */ /* from Real-Time Area Lighting: a Journey from Research to Production * Stephen Hill and Eric Heitz */ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
