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/TwistVert.frag.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/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 | } |