[Bf-blender-cvs] [bb692a2d0f7] blender-v2.82-release: Fix T59747 EEVEE: Bug on EnvironmentTexture

[Clément Foucault]

Commit: bb692a2d0f78cc5702aee9fceda4fa500ec5d7e8
Author: Clément Foucault
Date:   Mon Jan 20 13:48:18 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBbb692a2d0f78cc5702aee9fceda4fa500ec5d7e8

Fix T59747 EEVEE: Bug on EnvironmentTexture

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

M	source/blender/draw/engines/eevee/shaders/lit_surface_frag.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 978ce149be4..8c2619650b9 100644
--- a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
@@ -177,7 +177,8 @@ void CLOSURE_NAME(vec3 N
   out_refr = vec3(0.0);
 #endif
 
-#ifdef SHADOW_SHADER
+#if defined(SHADOW_SHADER) || defined(WORLD_BACKGROUND)
+  /* This makes shader resources become unused and avoid issues with samplers. (see T59747) */
   return;
 #else