diff options
| author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
| commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
| tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /assets/shaders/TwistVert.frag.glsl | |
| parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | } |