diff options
| author | Eric Guzman | 2012-02-13 10:29:49 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 10:29:49 -0800 |
| commit | e4893f7d3c3b9bd7967973197c3ffb5d3a075c91 (patch) | |
| tree | f3d4fd9d96ba0dcf846fbf66153fb443bd60f767 /assets/shaders/Basic.vert.glsl | |
| parent | ef032412216d437ce1c7dfc9050ab41adf0594c0 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-e4893f7d3c3b9bd7967973197c3ffb5d3a075c91.tar.gz | |
Merge branch 'refs/heads/master' into TreeComponents
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 |