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

Prevents shader crash if two struct with the same name are declared

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-02-21 13:45:01 +03:00
committed by Lyuma
parent ac547031d5
commit 2d1f8f2352
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/visual/shader_language.cpp
View File

@@ -5608,6 +5608,10 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
tk = _get_token(); tk = _get_token();
if (tk.type == TK_IDENTIFIER) { if (tk.type == TK_IDENTIFIER) {
st.name = tk.text; st.name = tk.text;
if (shader->structs.has(st.name)) {
_set_error("Redefinition of '" + String(st.name) + "'");
return ERR_PARSE_ERROR;
}
tk = _get_token(); tk = _get_token();
if (tk.type != TK_CURLY_BRACKET_OPEN) { if (tk.type != TK_CURLY_BRACKET_OPEN) {
_set_error("Expected '{'"); _set_error("Expected '{'");