aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-12 21:50:49 -0800
committerValerio Virgillito2012-02-12 21:50:49 -0800
commitdcd147265ad0339448ea4466253b03b2899e0cea (patch)
treea2afd9a3f4b4545141b21a31002d81bb5f79f44b /assets/shaders
parenta30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-dcd147265ad0339448ea4466253b03b2899e0cea.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into stage-color
Diffstat (limited to 'assets/shaders')
-rw-r--r--assets/shaders/Basic.vert.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 028786d1..0d5b8d63 100644
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -12,7 +12,7 @@ precision highp float;
12 12
13// attributes 13// attributes
14attribute vec3 a_pos; 14attribute vec3 a_pos;
15 15attribute vec2 texcoord;
16 16
17 17
18// matrix uniforms 18// matrix uniforms