Merge pull request #45066 from Chaosus/shader_fix_uniform_crash

Prevent editor crash due to modify the order of non-instance shader uniforms by instance uniforms

1 files changed, 3 insertions, 1 deletions

diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index 0cb9220bb3..2fa3355d2f 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -6305,7 +6305,9 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
 						}
 
 						uniform2.texture_order = -1;
-						uniform2.order = uniforms++;
+						if (uniform_scope != ShaderNode::Uniform::SCOPE_INSTANCE) {
+							uniform2.order = uniforms++;
+						}
 					}
 					uniform2.type = type;
 					uniform2.scope = uniform_scope;