diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:41 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:41 +0300 |
commit | 0fd4b3b9ae8b1e95f73b3ad2697b8782ce97794e (patch) | |
tree | 21ff4d19977f61453923c6655d02a43a84d67fb7 /indra/newview/app_settings/shaders | |
parent | 2ae6df6095242c12e31774cfe044c447b5987c6c (diff) | |
parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) |
Merge branch 'master' into DRTVWR-518-ui
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index 88959266c8..4bb588335a 100644 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -93,6 +93,5 @@ void main() col.rgb += light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); col.rgb += light_diffuse[2].rgb*calcLocalLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); col.rgb += light_diffuse[3].rgb*calcLocalLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); - vertex_color = col*color; } |