Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-23 13:07:00 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-23 13:10:53 +0300
commitcbbb021596c71f65862216ca381ab2054c6c6c2e (patch)
tree3fa897c5d9387eefc3b3340748742ab42bfe219d /source/blender/gpu
parentde8494b54e9f02968075f6c3785a557c4cfc9535 (diff)
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.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_basic_shader.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c
index b6fe40a13ee..088dac6f6cc 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};