diff options
| author | Joshua Reisenauer <[email protected]> | 2016-06-03 14:01:04 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <[email protected]> | 2016-06-03 14:01:04 -0700 |
| commit | e3b248545353720090f28a6c4e8a8c8a34bb1269 (patch) | |
| tree | 59e40c6862a88affa8bcdba4979c6a8956581ac1 /shaders/glsl330/template.fs | |
| parent | 96fa716525e22f9f75575f2dc1b431c58567d8a1 (diff) | |
| parent | 60232810d83c7ea3a52491f0b20444003be53358 (diff) | |
| download | raylib-e3b248545353720090f28a6c4e8a8c8a34bb1269.tar.gz raylib-e3b248545353720090f28a6c4e8a8c8a34bb1269.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'shaders/glsl330/template.fs')
| -rw-r--r-- | shaders/glsl330/template.fs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shaders/glsl330/template.fs b/shaders/glsl330/template.fs index 55b8d4a4..2e73de14 100644 --- a/shaders/glsl330/template.fs +++ b/shaders/glsl330/template.fs @@ -6,7 +6,7 @@ in vec4 fragColor; // Input uniform values uniform sampler2D texture0; -uniform vec4 fragTintColor; +uniform vec4 colDiffuse; // Output fragment color out vec4 finalColor; @@ -20,5 +20,5 @@ void main() // NOTE: Implement here your fragment shader code - finalColor = texelColor*fragTintColor; + finalColor = texelColor*colDiffuse; } |