diff options
| author | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
| commit | 4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/Taper.vert.glsl | |
| parent | 616b31a644ee221edcbc19f821b2194e8edf9fad (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'assets/shaders/Taper.vert.glsl')
| -rw-r--r-- | assets/shaders/Taper.vert.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl index 30b73456..eb562c2f 100644 --- a/assets/shaders/Taper.vert.glsl +++ b/assets/shaders/Taper.vert.glsl | |||
| @@ -24,8 +24,6 @@ uniform float u_minVal; | |||
| 24 | uniform float u_maxVal; | 24 | uniform float u_maxVal; |
| 25 | uniform float u_center; | 25 | uniform float u_center; |
| 26 | 26 | ||
| 27 | uniform vec4 color; | ||
| 28 | |||
| 29 | 27 | ||
| 30 | // matrix uniforms | 28 | // matrix uniforms |
| 31 | uniform mat4 u_mvMatrix; | 29 | uniform mat4 u_mvMatrix; |