diff options
author | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
commit | d262ca32d3b80803595fcc3f61f008786125250d (patch) | |
tree | ab7b8e13920b309321390f41c663b775f162b0c7 /indra/newview/app_settings/shaders/class1/objects | |
parent | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (diff) | |
parent | 1c9a4fc080bee955b5b18750fe8de7c24a3f912f (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index 7f3f84398b..c325a236d7 100755 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -91,8 +91,8 @@ void main() // Collect normal lights (need to be divided by two, as we later multiply by 2) col.rgb += light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); - col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); - col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); + col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], 1.f/light_attenuation[2].x, light_attenuation[2].z); + col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], 1.f/light_attenuation[3].x, light_attenuation[3].z); vertex_color = col*color; } |