diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-12-17 16:51:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-12-17 16:51:57 -0500 |
| commit | ca9051c74c71a711f466e7014886ef3bc13b3d2d (patch) | |
| tree | cad5bb01c0fc60e1b669b254c2623285dea467ba /indra/newview/app_settings/shaders/class1/lighting | |
| parent | fb99b1a1b4c40932af1e3fbe4b3e371a87ad4c8f (diff) | |
| parent | 7d173dffa98c3c14d6d7db457ea813d3c85dcfa8 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl index 99a6fe85fe..9c82056fd7 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl @@ -31,7 +31,7 @@ out vec4 frag_color; uniform float minimum_alpha; -vec4 diffuseLookup(vec2 texcoord); +/* vec4 diffuseLookup(vec2 texcoord); */ vec3 fullbrightAtmosTransport(vec3 light); vec4 applyWaterFog(vec4 color); diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl index df182168f3..d3dacf9bc4 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl @@ -32,7 +32,7 @@ out vec4 frag_color; VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; -vec4 diffuseLookup(vec2 texcoord); +/* vec4 diffuseLookup(vec2 texcoord); */ vec3 fullbrightAtmosTransport(vec3 light); vec4 applyWaterFog(vec4 color); |