diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-26 14:56:49 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-26 14:56:49 -0500 |
commit | 2d9785d8c747fd2c5c0ad40148fc318596b07f66 (patch) | |
tree | 9fee89872ee9d5d75baf9330fea48706bbccc2c4 /indra/newview/app_settings/shaders/class1/environment | |
parent | da1898d1cb9a1539a897541afebe47ff6f517d30 (diff) |
SH-2546 Don't feed vertex color to terrain vertex buffers.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/terrainV.glsl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl index f183b885d1..d09c5f9247 100644 --- a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl @@ -33,7 +33,6 @@ uniform vec4 object_plane_s; ATTRIBUTE vec3 position; ATTRIBUTE vec3 normal; -ATTRIBUTE vec4 diffuse_color; ATTRIBUTE vec2 texcoord0; ATTRIBUTE vec2 texcoord1; @@ -72,7 +71,7 @@ void main() /// Potentially better without it for water. pos /= pos.w; - vec4 color = calcLighting(pos.xyz, norm, diffuse_color, vec4(0)); + vec4 color = calcLighting(pos.xyz, norm, vec4(1,1,1,1), vec4(0)); vertex_color = color; |