Merge pull request #66370 from bitbrain/fix-light2d-blend-modes

Fix broken 2D light blending, addresses #49922
godotengine · Sep 27, 2022 · 2ad63f6 · 2ad63f6
2 parents ed65f90 + 2047be4
commit 2ad63f6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/servers/rendering/renderer_rd/shaders/canvas.glsl b/servers/rendering/renderer_rd/shaders/canvas.glsl
@@ -595,6 +595,8 @@ 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);
 #elif !defined(MODE_UNSHADED)
@@ -636,6 +638,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 
@@ -732,6 +736,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 #endif