diff options
| author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
| commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
| tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /assets/shaders/Basic.vert.glsl | |
| parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
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 |