diff options
| author | Unai IRIGOYEN <u.irigoyen@gmail.com> | 2015-03-12 00:30:07 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-05-14 12:11:40 +0000 |
| commit | 062293f800946feb523dd7abbcd3e06863f8f9b2 (patch) | |
| tree | d2be430d9487cdb75dc45fbf836e790f1bb2beb1 | |
| parent | d2995cbb25d5ba672c614c47ee1f7581a8c91f13 (diff) | |
Fix some small typos
Fix a typo in QPhongMaterial class which caused setting ambient value
to shininess parameter.
Fix a typo in ES2 version of pervertexcolor fragment shader.
Change-Id: I4623905a800ad310f19eb95d7391faaf70e9dd2b
Task-number: QTBUG-44907
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| -rw-r--r-- | src/render/shaders/es2/pervertexcolor.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/shaders/es2/pervertexcolor.frag b/src/render/shaders/es2/pervertexcolor.frag index ff00557f3..e9a6800bb 100644 --- a/src/render/shaders/es2/pervertexcolor.frag +++ b/src/render/shaders/es2/pervertexcolor.frag @@ -21,5 +21,5 @@ FP vec3 adModel( const FP vec3 pos, const FP vec3 n, const FP vec3 col ) void main() { - gl_FragColor = vec4( adModel( position, normalize( normal ) ), 1.0 ); + gl_FragColor = vec4( adModel( position, normalize( normal ), color ), 1.0 ); } |