3 files changed, 14 insertions, 46 deletions
diff --git a/servers/audio/effects/audio_effect_capture.cpp b/servers/audio/effects/audio_effect_capture.cpp
index 37e4122e50..78837c7531 100644
--- a/servers/audio/effects/audio_effect_capture.cpp
+++ b/servers/audio/effects/audio_effect_capture.cpp
@@ -91,8 +91,6 @@ Ref<AudioEffectInstance> AudioEffectCapture::instance() {
 }
 
 void AudioEffectCapture::set_buffer_length(float p_buffer_length_seconds) {
-	ERR_FAIL_COND(buffer_initialized);
-
 	buffer_length_seconds = p_buffer_length_seconds;
 }
 
diff --git a/servers/navigation_server_2d.cpp b/servers/navigation_server_2d.cpp
index 7e579c36f4..9e32bc209b 100644
--- a/servers/navigation_server_2d.cpp
+++ b/servers/navigation_server_2d.cpp
@@ -132,7 +132,8 @@ static Vector<Vector2> vector_v3_to_v2(const Vector<Vector3> &d) {
 static Transform trf2_to_trf3(const Transform2D &d) {
 	Vector3 o(v2_to_v3(d.get_origin()));
 	Basis b;
-	b.rotate(Vector3(0, 1, 0), d.get_rotation());
+	b.rotate(Vector3(0, -1, 0), d.get_rotation());
+	b.scale(v2_to_v3(d.get_scale()));
 	return Transform(b, o);
 }
 
diff --git a/servers/rendering/renderer_rd/shaders/SCsub b/servers/rendering/renderer_rd/shaders/SCsub
index 0f85e3fa30..fc513d3fb9 100644
--- a/servers/rendering/renderer_rd/shaders/SCsub
+++ b/servers/rendering/renderer_rd/shaders/SCsub
@@ -3,46 +3,15 @@
 Import("env")
 
 if "RD_GLSL" in env["BUILDERS"]:
-    env.RD_GLSL("canvas.glsl")
-    env.RD_GLSL("canvas_occlusion.glsl")
-    env.RD_GLSL("canvas_sdf.glsl")
-    env.RD_GLSL("copy.glsl")
-    env.RD_GLSL("copy_to_fb.glsl")
-    env.RD_GLSL("cubemap_roughness.glsl")
-    env.RD_GLSL("cubemap_downsampler.glsl")
-    env.RD_GLSL("cubemap_filter.glsl")
-    env.RD_GLSL("scene_forward_clustered.glsl")
-    env.RD_GLSL("sky.glsl")
-    env.RD_GLSL("tonemap.glsl")
-    env.RD_GLSL("cube_to_dp.glsl")
-    env.RD_GLSL("giprobe.glsl")
-    env.RD_GLSL("giprobe_debug.glsl")
-    env.RD_GLSL("giprobe_sdf.glsl")
-    env.RD_GLSL("luminance_reduce.glsl")
-    env.RD_GLSL("bokeh_dof.glsl")
-    env.RD_GLSL("ssao.glsl")
-    env.RD_GLSL("ssao_downsample.glsl")
-    env.RD_GLSL("ssao_importance_map.glsl")
-    env.RD_GLSL("ssao_blur.glsl")
-    env.RD_GLSL("ssao_interleave.glsl")
-    env.RD_GLSL("roughness_limiter.glsl")
-    env.RD_GLSL("screen_space_reflection.glsl")
-    env.RD_GLSL("screen_space_reflection_filter.glsl")
-    env.RD_GLSL("screen_space_reflection_scale.glsl")
-    env.RD_GLSL("subsurface_scattering.glsl")
-    env.RD_GLSL("specular_merge.glsl")
-    env.RD_GLSL("gi.glsl")
-    env.RD_GLSL("resolve.glsl")
-    env.RD_GLSL("sdfgi_preprocess.glsl")
-    env.RD_GLSL("sdfgi_integrate.glsl")
-    env.RD_GLSL("sdfgi_direct_light.glsl")
-    env.RD_GLSL("sdfgi_debug.glsl")
-    env.RD_GLSL("sdfgi_debug_probes.glsl")
-    env.RD_GLSL("volumetric_fog.glsl")
-    env.RD_GLSL("particles.glsl")
-    env.RD_GLSL("particles_copy.glsl")
-    env.RD_GLSL("sort.glsl")
-    env.RD_GLSL("skeleton.glsl")
-    env.RD_GLSL("cluster_render.glsl")
-    env.RD_GLSL("cluster_store.glsl")
-    env.RD_GLSL("cluster_debug.glsl")
+    # find all include files
+    gl_include_files = [str(f) for f in Glob("*_inc.glsl")]
+
+    # find all shader code(all glsl files excluding our include files)
+    glsl_files = [str(f) for f in Glob("*.glsl") if str(f) not in gl_include_files]
+
+    # make sure we recompile shaders if include files change
+    env.Depends([f + ".gen.h" for f in glsl_files], gl_include_files)
+
+    # compile shaders
+    for glsl_file in glsl_files:
+        env.RD_GLSL(glsl_file)