Merge branch 'master' into one-true-struct

Author: mcdubhghlas

drivers/gles3/shaders/scene.glsl

@@ -2327,6 +2327,8 @@ void main() {
 #else
 
 	diffuse_light *= albedo;
+	diffuse_light *= ao;
+	specular_light *= ao;
 	diffuse_light *= 1.0 - metallic;
 	ambient_light *= 1.0 - metallic;
 
@@ -2599,6 +2601,8 @@ void main() {
 #endif // ADDITIVE_SPOT
 
 	diffuse_light *= albedo;
+	diffuse_light *= ao;
+	specular_light *= ao;
 	diffuse_light *= 1.0 - metallic;
 	vec3 additive_light_color = diffuse_light + specular_light;
 

drivers/gles3/shaders/sky.glsl

@@ -195,7 +195,7 @@ void main() {
 	cube_normal = mat3(orientation) * cube_normal;
 	cube_normal = normalize(cube_normal);
 
-	vec2 uv = gl_FragCoord.xy; // uv_interp * 0.5 + 0.5;
+	vec2 uv = uv_interp * 0.5 + 0.5;
 
 	vec2 panorama_coords = vec2(atan2_approx(cube_normal.x, -cube_normal.z), acos_approx(cube_normal.y));