Merge pull request #83 from raysan5/develop

Develop branch integration

1 files changed, 3 insertions, 3 deletions

diff --git a/shaders/gl330/grayscale.fs b/shaders/gl330/grayscale.fs
index 38337e00..b3a695bf 100644
--- a/shaders/gl330/grayscale.fs
+++ b/shaders/gl330/grayscale.fs
@@ -5,16 +5,16 @@ in vec2 fragTexCoord;
 out vec4 fragColor;
 
 uniform sampler2D texture0;
-uniform vec4 tintColor;
+uniform vec4 fragTintColor;
 
 // NOTE: Add here your custom variables
 
 void main()
 {
-    vec4 base = texture2D(texture0, fragTexCoord)*tintColor;
+    vec4 base = texture(texture0, fragTexCoord)*fragTintColor;
     
     // Convert to grayscale using NTSC conversion weights
     float gray = dot(base.rgb, vec3(0.299, 0.587, 0.114));
     
-    fragColor = vec4(gray, gray, gray, tintColor.a);
+    fragColor = vec4(gray, gray, gray, fragTintColor.a);
 }
\ No newline at end of file