From 54e054cce4b013bc70df56059bf0fcd4bfee9827 Mon Sep 17 00:00:00 2001 From: IRIE Shinsuke Date: Thu, 29 May 2014 14:53:33 +0900 Subject: Followup to rB1973b17fce65, partially bring back GLSL lamp's previous behavior. Using layer visibility in active render layer makes more accurate preview but can cause problems in some cases: https://developer.blender.org/rB1973b17fce65a4dfececb45b19abec37898c1ab5#comment-1 GLSL lamps now ignore layer visibility if lock_camera_and_layers is OFF or game engine is running. The material lamp group still works unconditionally though. --- source/gameengine/Ketsji/BL_BlenderShader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine') diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp index 6f6925dcf76..bcdef85bc8a 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.cpp +++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp @@ -77,7 +77,7 @@ void BL_BlenderShader::SetProg(bool enable, double time, RAS_IRasterizer* rasty) view.getValue((float*)viewmat); viewinv.getValue((float*)viewinvmat); - GPU_material_bind(mGPUMat, mLightLayer, mBlenderScene->lay, time, 1, viewmat, viewinvmat); + GPU_material_bind(mGPUMat, mLightLayer, mBlenderScene->lay, time, 1, viewmat, viewinvmat, false); } else GPU_material_unbind(mGPUMat); -- cgit v1.2.3