diff options
| author | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
| commit | 38f571d1fdf02d36c3816637af7b2ca2493809da (patch) | |
| tree | 69b97839be8b2b6fb65e9150d4dc02856041fb1d /assets/shaders/TwistVert.frag.glsl | |
| parent | f7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff) | |
| parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
| download | ninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz | |
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'assets/shaders/TwistVert.frag.glsl')
| -rw-r--r-- | assets/shaders/TwistVert.frag.glsl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl index f8490615..01c32c42 100644 --- a/assets/shaders/TwistVert.frag.glsl +++ b/assets/shaders/TwistVert.frag.glsl | |||
| @@ -28,5 +28,4 @@ void main() | |||
| 28 | col = texture2D(u_tex1, v_texcoord).xyz; | 28 | col = texture2D(u_tex1, v_texcoord).xyz; |
| 29 | 29 | ||
| 30 | gl_FragColor = vec4(col, 1.0); | 30 | gl_FragColor = vec4(col, 1.0); |
| 31 | //gl_FragColor = v_color; | ||
| 32 | } | 31 | } |