Merge pull request #2914 from akortunov/master

Fix typos in shaders
5 years ago · 50d692a097
parent 5110b5a0bf 9bc0e9b4b7
commit 50d692a097
2 changed files with 2 additions and 2 deletions
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@ -187,7 +187,7 @@ void main()

    if (matSpec != vec3(0.0))
    {
-#if (!normalMap && !@parallax && !forcePPL)
+#if (!@normalMap && !@parallax && !@forcePPL)
        vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
 #endif
        gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@ -96,7 +96,7 @@ void main()

    if (matSpec != vec3(0.0))
    {
-#if (!normalMap && !@parallax && !forcePPL)
+#if (!@normalMap && !@parallax && !@forcePPL)
        vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
 #endif
        gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec) * shadowing;