summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-16 14:36:22 -0500
committerDave Parks <davep@lindenlab.com>2013-05-16 14:36:22 -0500
commit4afa3557971f3a7cf750472112ef1755c7ff98db (patch)
tree209925f573ee6a4cc579536892264e3d1dbb9bf7 /indra/newview/app_settings
parentb3df764bd3c461df49f0f2289b66c87a76e71d34 (diff)
NORSPEC-185 Fix for regression caused by accidentally checking in debug code.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 599477ad9e..3c25f49fe0 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -625,13 +625,13 @@ void main()
#define LIGHT_LOOP(i) col.rgb = col.rgb + calcPointLightOrSpotLight(light_diffuse[i].rgb, npos, diffuse.rgb, final_specular, pos.xyz, norm.xyz, light_position[i], light_direction[i].xyz, light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z, glare);
- /*LIGHT_LOOP(1)
+ LIGHT_LOOP(1)
LIGHT_LOOP(2)
LIGHT_LOOP(3)
LIGHT_LOOP(4)
LIGHT_LOOP(5)
LIGHT_LOOP(6)
- LIGHT_LOOP(7)*/
+ LIGHT_LOOP(7)
frag_color.rgb = col.rgb;
glare = min(glare, 1.0);