diff options
| author | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
| commit | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (patch) | |
| tree | 8c07b1203de42f6efdeebfc8663072fffb4a567b /assets/shaders/test_fshader.glsl | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| parent | 52833c3d8a485944c42acc6ac0ae5139b3427da8 (diff) | |
| download | ninja-120e31dcf1e11eed11ee430d77c438e7b073e9f8.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'assets/shaders/test_fshader.glsl')
| -rwxr-xr-x | assets/shaders/test_fshader.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl index 629d1878..229b8989 100755 --- a/assets/shaders/test_fshader.glsl +++ b/assets/shaders/test_fshader.glsl | |||
| @@ -32,7 +32,7 @@ uniform sampler2D depthMap; | |||
| 32 | uniform vec4 u_matAmbient; | 32 | uniform vec4 u_matAmbient; |
| 33 | uniform vec4 u_matDiffuse; | 33 | uniform vec4 u_matDiffuse; |
| 34 | uniform vec4 u_matSpecular; | 34 | uniform vec4 u_matSpecular; |
| 35 | uniform float u_matShininess; | 35 | //uniform float u_matShininess; |
| 36 | uniform vec4 u_matEmission; | 36 | uniform vec4 u_matEmission; |
| 37 | uniform float u_renderGlow; | 37 | uniform float u_renderGlow; |
| 38 | 38 | ||