diff options
| author | simon <none@none> | 2013-04-11 16:23:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:23:36 -0700 |
| commit | 066f2acadf6f1624fcdfc22263a890c370473887 (patch) | |
| tree | a4e52b29d8074cdc8782ff28b9b0500b32dada50 /indra/newview/app_settings/shaders/class1 | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Forgot to commit @#! merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
| -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); |