diff options
| author | graham linden <graham@lindenlab.com> | 2013-05-02 09:12:20 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-05-02 09:12:20 -0700 |
| commit | 33d22256663a074d6e7d9cb1b080b57202a06b05 (patch) | |
| tree | d926226beb28e0c94fc006fc708f419a328bede4 /indra/newview/app_settings/shaders/class2/deferred | |
| parent | 91c618c8cdfdb57d18eeca4da7f7e986e6adb828 (diff) | |
| parent | 90c2be46bf677db00207a45478ade362b90d7a6c (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 15584548cc..10a598a85c 100755 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -330,8 +330,6 @@ void main() col += spec_contrib; } - col = mix(col, diffuse.rgb, diffuse.a); - if (envIntensity > 0.0) { //add environmentmap vec3 env_vec = env_mat * refnormpersp; @@ -341,6 +339,8 @@ void main() col = atmosLighting(col); col = scaleSoftClip(col); + + col = mix(col.rgb, diffuse.rgb, diffuse.a); } |