diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-31 11:25:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-31 11:25:54 +0300 |
| commit | fe6e751e695dbb32e4dc7ed20726ee3d266d0c7e (patch) | |
| tree | c280f24066e373ae3c57ff3d29253644710e4883 | |
| parent | 51c38b5d495e406a0c13216470927c5ce0f71e4f (diff) | |
Workbench: Correct ifndef after recent changes
Usage of matcap image uniform had different ifdef than definition
of that uniform. Assuming the usage was correct, and the definition
needed an update.
Prevents shader from compilation failure and from aborts in debug
builds.
| -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 |