diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl | |
parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl index 2e6982d101..3f09a15375 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl @@ -57,8 +57,6 @@ void main() vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; calcAtmospherics(pos.xyz); - - vertex_color = diffuse_color; - + vertex_color = diffuse_color; } |