diff options
| author | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
| commit | 4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/test_fshader.glsl | |
| parent | 616b31a644ee221edcbc19f821b2194e8edf9fad (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 | ||