diff options
| author | John Mayhew | 2012-02-10 16:20:45 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:20:45 -0800 |
| commit | eb0032234971f2c1c471f562d52c086fcffe8a14 (patch) | |
| tree | 9fe9a49b5b49c3c0d15ea4fc124df4c100ffb730 /assets/shaders | |
| parent | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (diff) | |
| parent | 344933fd505afb9f5dfa3be8cc959112df04da0a (diff) | |
| download | ninja-eb0032234971f2c1c471f562d52c086fcffe8a14.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'assets/shaders')
| -rw-r--r-- | 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 100644 --- 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 |