1 files changed, 15 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/shaders/canvas.glsl b/servers/rendering/renderer_rd/shaders/canvas.glsl
index 459d798a80..45dc63aa17 100644
--- a/servers/rendering/renderer_rd/shaders/canvas.glsl
+++ b/servers/rendering/renderer_rd/shaders/canvas.glsl
@@ -313,6 +313,14 @@ vec4 light_compute(
 		vec2 uv,
 		vec4 color, bool is_directional) {
 	vec4 light = vec4(0.0);
+	vec3 light_direction = vec3(0.0);
+
+	if (is_directional) {
+		light_direction = normalize(mix(vec3(light_position.xy, 0.0), vec3(0, 0, 1), light_position.z));
+		light_position = vec3(0.0);
+	} else {
+		light_direction = normalize(light_position - light_vertex);
+	}
 
 #CODE : LIGHT
 
@@ -595,9 +603,11 @@ void main() {
 		color = vec4(0.0); //invisible by default due to using light mask
 	}
 
+	vec4 original_color = color;
+
 #ifdef MODE_LIGHT_ONLY
 	color = vec4(0.0);
-#else
+#elif !defined(MODE_UNSHADED)
 	color *= canvas_data.canvas_modulation;
 #endif
 
@@ -636,6 +646,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 
@@ -682,7 +694,6 @@ void main() {
 			vec3 light_pos = vec3(light_array.data[light_base].position, light_array.data[light_base].height);
 			vec3 pos = light_vertex;
 			vec3 light_vec = normalize(light_pos - pos);
-			float cNdotL = max(0.0, dot(normal, light_vec));
 
 			light_color.rgb = light_normal_compute(light_vec, normal, base_color, light_color.rgb, specular_shininess, specular_shininess_used);
 		}
@@ -732,6 +743,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 #endif