From fe6e751e695dbb32e4dc7ed20726ee3d266d0c7e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 31 Jul 2018 10:25:54 +0200 Subject: [PATCH] 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. --- .../shaders/workbench_forward_transparent_accum_frag.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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