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/BasicTex.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/BasicTex.frag.glsl')
| -rw-r--r-- | assets/shaders/BasicTex.frag.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/shaders/BasicTex.frag.glsl b/assets/shaders/BasicTex.frag.glsl index 4fee288d..d89e2ead 100644 --- a/assets/shaders/BasicTex.frag.glsl +++ b/assets/shaders/BasicTex.frag.glsl | |||
| @@ -35,7 +35,7 @@ precision highp float; | |||
| 35 | 35 | ||
| 36 | uniform sampler2D u_tex0; | 36 | uniform sampler2D u_tex0; |
| 37 | 37 | ||
| 38 | varying vec2 v_texCoord0; | 38 | varying vec2 v_texCoord0; |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | void main() { | 41 | void main() { |