diff options
author | Ananya Sen | 2012-02-13 16:19:21 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-13 16:19:21 -0800 |
commit | b58dafe332fb57210f3d059a518a3d183c222631 (patch) | |
tree | 09fd958b0f7f3f51dc88e613e7764bdfc642b742 /assets/shaders | |
parent | f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff) | |
parent | f70701db069a10dc5195605fc378a022125b434f (diff) | |
download | ninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'assets/shaders')
-rwxr-xr-x | assets/shaders/Basic.vert.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 028786d1..0d5b8d63 100755 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl | |||
@@ -12,7 +12,7 @@ precision highp float; | |||
12 | 12 | ||
13 | // attributes | 13 | // attributes |
14 | attribute vec3 a_pos; | 14 | attribute vec3 a_pos; |
15 | 15 | attribute vec2 texcoord; | |
16 | 16 | ||
17 | 17 | ||
18 | // matrix uniforms | 18 | // matrix uniforms |