synched with trunk at revision 36569
[blender.git] / source / blender / gpu / intern / gpu_shader_vertex.glsl
index ba9ef7d..68c8ed8 100644 (file)
@@ -1,3 +1,4 @@
+<<<<<<< .working
 
 varying vec3 varposition;
 varying vec3 varnormal;
@@ -10,3 +11,17 @@ void main()
        varnormal = gl_NormalMatrix * gl_Normal;
        gl_Position = gl_ProjectionMatrix * co;
 
+=======
+
+varying vec3 varposition;
+varying vec3 varnormal;
+
+void main()
+{
+       vec4 co = gl_ModelViewMatrix * gl_Vertex;
+
+       varposition = co.xyz;
+       varnormal = normalize(gl_NormalMatrix * gl_Normal);
+       gl_Position = gl_ProjectionMatrix * co;
+
+>>>>>>> .merge-right.r36569