[Bf-blender-cvs] [fe6e751e695] blender2.8: Workbench: Correct ifndef after recent changes

[Sergey Sharybin]

Commit: fe6e751e695dbb32e4dc7ed20726ee3d266d0c7e
Author: Sergey Sharybin
Date:   Tue Jul 31 10:25:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfe6e751e695dbb32e4dc7ed20726ee3d266d0c7e

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.

===================================================================

M	source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl

===================================================================

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