Merge branch 'master' into GPU_SKIN_ON_BY_DEFAULT

examples/shaders/resources/shaders/glsl100/pbr.fs

@@ -99,7 +99,7 @@ vec3 ComputePBR()
     vec3 N = normalize(fragNormal);
     if (useTexNormal == 1)
     {
-        N = texture2D(normalMap, vec2(fragTexCoord.x*tiling.x + offset.y, fragTexCoord.y*tiling.y + offset.y)).rgb;
+        N = texture2D(normalMap, vec2(fragTexCoord.x*tiling.x + offset.x, fragTexCoord.y*tiling.y + offset.y)).rgb;
         N = normalize(N*2.0 - 1.0);
         N = normalize(N*TBN);
     }

examples/shaders/resources/shaders/glsl120/pbr.fs

@@ -97,7 +97,7 @@ vec3 ComputePBR()
     vec3 N = normalize(fragNormal);
     if (useTexNormal == 1)
     {
-        N = texture2D(normalMap, vec2(fragTexCoord.x*tiling.x + offset.y, fragTexCoord.y*tiling.y + offset.y)).rgb;
+        N = texture2D(normalMap, vec2(fragTexCoord.x*tiling.x + offset.x, fragTexCoord.y*tiling.y + offset.y)).rgb;
         N = normalize(N*2.0 - 1.0);
         N = normalize(N*TBN);
     }

examples/shaders/resources/shaders/glsl330/pbr.fs

@@ -100,7 +100,7 @@ vec3 ComputePBR()
     vec3 N = normalize(fragNormal);
     if (useTexNormal == 1)
     {
-        N = texture(normalMap, vec2(fragTexCoord.x*tiling.x + offset.y, fragTexCoord.y*tiling.y + offset.y)).rgb;
+        N = texture(normalMap, vec2(fragTexCoord.x*tiling.x + offset.x, fragTexCoord.y*tiling.y + offset.y)).rgb;
         N = normalize(N*2.0 - 1.0);
         N = normalize(N*TBN);
     }