Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop

2 files changed, 4 insertions, 4 deletions

diff --git a/shaders/glsl100/grayscale.fs b/shaders/glsl100/grayscale.fs
index f92ec335..c76dd8af 100644
--- a/shaders/glsl100/grayscale.fs
+++ b/shaders/glsl100/grayscale.fs
@@ -8,14 +8,14 @@ varying vec4 fragColor;
 
 // Input uniform values
 uniform sampler2D texture0;
-uniform vec4 fragTintColor;
+uniform vec4 colDiffuse;
 
 // NOTE: Add here your custom variables
 
 void main()
 {
     // Texel color fetching from texture sampler
-    vec4 texelColor = texture(texture0, fragTexCoord)*fragTintColor*fragColor;
+    vec4 texelColor = texture(texture0, fragTexCoord)*colDiffuse*fragColor;
     
     // Convert texel color to grayscale using NTSC conversion weights
     float gray = dot(texelColor.rgb, vec3(0.299, 0.587, 0.114));
diff --git a/shaders/glsl100/template.fs b/shaders/glsl100/template.fs
index a3942890..c1126423 100644
--- a/shaders/glsl100/template.fs
+++ b/shaders/glsl100/template.fs
@@ -8,7 +8,7 @@ varying vec4 fragColor;
 
 // Input uniform values
 uniform sampler2D texture0;
-uniform vec4 fragTintColor;
+uniform vec4 colDiffuse;
 
 // NOTE: Add here your custom variables
 
@@ -19,5 +19,5 @@ void main()
     
     // NOTE: Implement here your fragment shader code
     
-    gl_FragColor = texelColor*fragTintColor;
+    gl_FragColor = texelColor*colDiffuse;
 }
\ No newline at end of file