Commit: 62b786b3221bc8893d332d03d7593d580eb782d0
Author: Sergey Sharybin
Date: Mon May 23 12:07:00 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB62b786b3221bc8893d332d03d7593d580eb782d0
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};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
