diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
| commit | b8ab411185c11ce98e7e791b0d30a9d9b1ce6d69 (patch) | |
| tree | 9c219e06fc6a1f9b09d6fbf7d86c8526cfa6d775 /source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl | |
| parent | 209686f1c8189bc01f91d14a922651844df8b201 (diff) | |
| parent | dc2d841b7c50565302af2986d62ddbd29c332acd (diff) | |
Merge branch 'hair_guides' into hair_guides_groominghair_guides_grooming
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl')
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl index 81b6b2567a9..67a22073a4b 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl @@ -19,7 +19,7 @@ in vec3 normal_viewport; #ifdef V3D_SHADING_TEXTURE_COLOR in vec2 uv_interp; #endif -#ifdef STUDIOLIGHT_ORIENTATION_VIEWNORMAL +#ifdef V3D_LIGHTING_MATCAP uniform sampler2D matcapImage; #endif |