diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /assets/shaders/Taper.vert.glsl | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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; |