diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /assets/shaders/TwistVert.frag.glsl | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'assets/shaders/TwistVert.frag.glsl')
| -rw-r--r-- | assets/shaders/TwistVert.frag.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl index 22104e4e..545d4f51 100644 --- a/assets/shaders/TwistVert.frag.glsl +++ b/assets/shaders/TwistVert.frag.glsl | |||
| @@ -46,10 +46,10 @@ varying vec2 v_texcoord; | |||
| 46 | void main() | 46 | void main() |
| 47 | { | 47 | { |
| 48 | vec3 col; | 48 | vec3 col; |
| 49 | if (v_zNormal >= 0.0) | 49 | if (v_zNormal >= 0.0) |
| 50 | col = texture2D(u_tex0, v_texcoord).xyz; | 50 | col = texture2D(u_tex0, v_texcoord).xyz; |
| 51 | else | 51 | else |
| 52 | col = texture2D(u_tex1, v_texcoord).xyz; | 52 | col = texture2D(u_tex1, v_texcoord).xyz; |
| 53 | 53 | ||
| 54 | gl_FragColor = vec4(col, 1.0); | 54 | gl_FragColor = vec4(col, 1.0); |
| 55 | } | 55 | } |