[Bf-blender-cvs] [cbbb021] master: Fix for all OpenGL lights affecting Cycles viewport, regardless of their Enabled state

[Sergey Sharybin]

Commit: cbbb021596c71f65862216ca381ab2054c6c6c2e
Author: Sergey Sharybin
Date:   Mon May 23 12:07:00 2016 +0200
Branches: master
https://developer.blender.org/rBcbbb021596c71f65862216ca381ab2054c6c6c2e

Fix for all OpenGL lights affecting Cycles viewport, regardless of their Enabled state

Was a regression since e1b8a5d.

Probably not very optimal fix, but better than a regression anyway.

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

M	source/blender/gpu/intern/gpu_basic_shader.c

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

diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c
index b6fe40a..088dac6 100644
--- a/source/blender/gpu/intern/gpu_basic_shader.c
+++ b/source/blender/gpu/intern/gpu_basic_shader.c
@@ -552,7 +552,8 @@ void GPU_basic_shader_light_set(int light_num, GPULightData *light)
 			GPU_MATERIAL_STATE.lights_directional |= light_bit;
 	}
 	else {
-		if (USE_GLSL) {
+		/* TODO(sergey): Needs revisit. */
+		if (USE_GLSL || true) {
 			/* glsl shader needs these zero to skip them */
 			const float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f};