diff options
| author | Armen Kesablyan | 2012-02-13 13:36:52 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 13:36:52 -0800 |
| commit | da32190d5dd91fa2c26f8cabb746980c3d06035c (patch) | |
| tree | d923299208c84b1071b58e7eb9c0515b2e1c844a /assets/shaders/Basic.vert.glsl | |
| parent | 36cefa3526988cb4dfea107fedaa954a2703260d (diff) | |
| parent | 90d0c8c0e98d062c628c061fe5765ce991fda409 (diff) | |
| download | ninja-da32190d5dd91fa2c26f8cabb746980c3d06035c.tar.gz | |
Merge branch 'refs/heads/master' into text-tool
Diffstat (limited to 'assets/shaders/Basic.vert.glsl')
| -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 |