summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/deferred
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-18 18:00:56 -0500
committerDave Parks <davep@lindenlab.com>2013-04-18 18:00:56 -0500
commit1a5bba865c096473164b47a56dbb0ba1e055613d (patch)
treec63cc85e81e455c562144005ced8d6a0b5159d03 /indra/newview/app_settings/shaders/class2/deferred
parent37f984a942ae175d21b3749f1ee7966fa5b337e8 (diff)
NORSPEC-90 Cleanup of alpha pool hook ups for materials.
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index 5faa94fb03..293613e74c 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -217,7 +217,7 @@ void main()
float vertex_color_alpha = vertex_color.a;
#endif
- vec3 normal = texture2D(bumpMap, vary_texcoord1.xy).xyz * 2 - 1;
+ vec3 normal = vec3(0,0,1);
vec3 l = light_position[0].xyz;
vec3 dlight = calcDirectionalLight(normal, l);
@@ -244,7 +244,6 @@ void main()
color.rgb += diff.rgb * vary_pointlight_col * col.rgb;
- frag_color = vec4(1,0,1,1);
- //frag_color = color;
+ frag_color = color;
}