Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons

This commit is contained in:
Enrico Turri 2019-02-28 11:45:11 +01:00
commit 9ff8cd01b3
9 changed files with 262 additions and 69 deletions

View file

@ -1,11 +1,12 @@
#version 110
attribute vec4 v_position;
attribute vec2 v_tex_coords;
varying vec2 tex_coords;
void main()
{
gl_Position = ftransform();
gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * v_position;
tex_coords = v_tex_coords;
}
}