diff options
author | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
commit | 74b5bfb98f0496a8e1519c4732bb5942e6fcc78a (patch) | |
tree | 8963d2db094d4fb349a31364b907087a48b4bddf /indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | |
parent | f0c2f99c25a4d73dac75203db881aaebaeeb25f6 (diff) | |
parent | 4f8827d2a8fc37f88d271be20f8fa03b14ec5732 (diff) |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 2905cc91b6..f50935c1a8 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -310,7 +310,7 @@ void main() //add environmentmap vec3 env_vec = env_mat * refnormpersp; col = mix(col.rgb, textureCube(environmentMap, env_vec).rgb, - max(spec.a-diffuse.a*2.0, 0.0)); + max(norm.a-diffuse.a*2.0, 0.0)); } col = atmosLighting(col); |