synched with trunk at revision 36569
[blender.git] / source / blender / gpu / intern / gpu_shader_vertex.glsl
1 <<<<<<< .working
2
3 varying vec3 varposition;
4 varying vec3 varnormal;
5
6 void main()
7 {
8         vec4 co = gl_ModelViewMatrix * gl_Vertex;
9
10         varposition = co.xyz;
11         varnormal = gl_NormalMatrix * gl_Normal;
12         gl_Position = gl_ProjectionMatrix * co;
13
14 =======
15
16 varying vec3 varposition;
17 varying vec3 varnormal;
18
19 void main()
20 {
21         vec4 co = gl_ModelViewMatrix * gl_Vertex;
22
23         varposition = co.xyz;
24         varnormal = normalize(gl_NormalMatrix * gl_Normal);
25         gl_Position = gl_ProjectionMatrix * co;
26
27 >>>>>>> .merge-right.r36569