Merge pull request #72695 from clayjohn/CanvasGroup-shading

Avoid shading CanvasGroup nodes twice
This commit is contained in:
Yuri Sizov 2023-02-04 21:38:25 +03:00 committed by GitHub
commit 2bd5302704
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions

View file

@ -2690,6 +2690,7 @@ RasterizerCanvasGLES3::RasterizerCanvasGLES3() {
// Default CanvasGroup shader.
shader_type canvas_item;
render_mode unshaded;
uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;
@ -2717,6 +2718,7 @@ void fragment() {
// Default clip children shader.
shader_type canvas_item;
render_mode unshaded;
uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;

View file

@ -649,7 +649,7 @@ void main() {
#ifdef MODE_LIGHT_ONLY
color = vec4(0.0);
#else
#elif !defined(MODE_UNSHADED)
color *= canvas_modulation;
#endif