summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-03-22 14:54:40 -0700
committerGraham Linden <graham@lindenlab.com>2019-03-22 14:54:40 -0700
commit9c8cc0037a11861fa0561e8cda01d9ec7c996442 (patch)
treebcba37fb8d63aca2c4816706f43c53874e941332 /indra/newview/app_settings/shaders/class1
parentb757c932929ce60e035b5d69a351f495a77b9f9d (diff)
Fix class1/2 light sum loops to use light_diffuse[0] for sunlight_color too.
Rearrange ordering of scale down of light in class1 as well.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl
index 41288c21c1..7d699a4967 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl
@@ -38,12 +38,10 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight)
col.a = color.a;
col.rgb = light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz);
+ col.rgb += light_diffuse[0].rgb * calcDirectionalLight(norm, light_position[0].xyz);
col.rgb = scaleDownLight(col.rgb);
col.rgb += atmosAmbient(baseLight.rgb);
- col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz));
-
col.rgb = min(col.rgb*color.rgb, 1.0);
-
return col;
}