Browse Source

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
Rémi Verschelde 4 years ago
parent
commit
a33dc4274c
1 changed files with 3 additions and 1 deletions
  1. 3 1
      servers/rendering/shader_language.cpp

+ 3 - 1
servers/rendering/shader_language.cpp

@@ -6305,7 +6305,9 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
 						}
 						}
 
 
 						uniform2.texture_order = -1;
 						uniform2.texture_order = -1;
-						uniform2.order = uniforms++;
+						if (uniform_scope != ShaderNode::Uniform::SCOPE_INSTANCE) {
+							uniform2.order = uniforms++;
+						}
 					}
 					}
 					uniform2.type = type;
 					uniform2.type = type;
 					uniform2.scope = uniform_scope;
 					uniform2.scope = uniform_scope;