diff options
| author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
| commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
| tree | 0ad3e94248a1d4828386c8743a670c709357a470 /assets/shaders/Taper.vert.glsl | |
| parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
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; |