diff options
| author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
| commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
| tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /assets/shaders/TwistVert.frag.glsl | |
| parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'assets/shaders/TwistVert.frag.glsl')
| -rw-r--r-- | assets/shaders/TwistVert.frag.glsl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl index f8490615..01c32c42 100644 --- a/assets/shaders/TwistVert.frag.glsl +++ b/assets/shaders/TwistVert.frag.glsl | |||
| @@ -28,5 +28,4 @@ void main() | |||
| 28 | col = texture2D(u_tex1, v_texcoord).xyz; | 28 | col = texture2D(u_tex1, v_texcoord).xyz; |
| 29 | 29 | ||
| 30 | gl_FragColor = vec4(col, 1.0); | 30 | gl_FragColor = vec4(col, 1.0); |
| 31 | //gl_FragColor = v_color; | ||
| 32 | } | 31 | } |