Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2011-10-22 01:17:59 +02:00
parent 1e9d09b82e 0e190cadcd
commit bd6d14d741
7 changed files with 153 additions and 89 deletions
--- a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
@@ -11,6 +11,6 @@ void main()
 	//transform vertex
 	gl_Position = gl_ModelViewProjectionMatrix*gl_Vertex;
 	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
-	gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
+	gl_TexCoord[1] = gl_TextureMatrix[0] * gl_MultiTexCoord1;
 	gl_FrontColor = gl_Color;
 }