diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl | |
parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl index 6c205074b4..8ba75010a2 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl @@ -30,7 +30,7 @@ ATTRIBUTE vec3 position; ATTRIBUTE vec4 diffuse_color; ATTRIBUTE vec3 normal; ATTRIBUTE vec2 texcoord0; -ATTRIBUTE vec2 texcoord2; +ATTRIBUTE vec3 binormal; VARYING vec3 vary_mat0; VARYING vec3 vary_mat1; @@ -52,7 +52,7 @@ void main() vec3 n = normalize((mat * vec4(normal.xyz+position.xyz, 1.0)).xyz-pos.xyz); - vec3 b = normalize((mat * vec4(vec4(texcoord2,0,1).xyz+position.xyz, 1.0)).xyz-pos.xyz); + vec3 b = normalize((mat * vec4(binormal.xyz+position.xyz, 1.0)).xyz-pos.xyz); vec3 t = cross(b, n); vary_mat0 = vec3(t.x, b.x, n.x); |