godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #45066 from Chaosus/shader_fix_uniform_crash

Browse Source 
Prevent editor crash due to modify the order of non-instance shader uniforms by instance uniforms
This commit is contained in:
Rémi Verschelde
2021-01-11 14:58:55 +01:00
committed by GitHub
parent 4f8a036fc5 289cc89a39
commit a33dc4274c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/shader_language.cpp
View File

@@ -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;