diff options
author | Jonathan Goodman <geenz@geenzo.com> | 2012-03-26 13:44:28 -0400 |
---|---|---|
committer | Jonathan Goodman <geenz@geenzo.com> | 2012-03-26 13:44:28 -0400 |
commit | c7106a02b9d16256f2677778074322707faf4d83 (patch) | |
tree | f4bc7108cd2cd1f9c4887ab8183ac65fcb3854e5 /indra/newview/app_settings/shaders/class2 | |
parent | 77df887b657f2a38474b3e3699d54d2e020e88ba (diff) |
Merging latest changes for normalized blinn-phong.
Diffstat (limited to 'indra/newview/app_settings/shaders/class2')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 97f3063a9e..471a4e0236 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -307,7 +307,7 @@ void main() // vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); float sa = dot(refnormpersp, sun_dir.xyz); - vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).r; + vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*(6 * texture2D(lightFunc, vec2(sa, spec.a)).r); // add the two types of shiny together vec3 spec_contrib = dumbshiny * spec.rgb; |