gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-30 14:22:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90792 from jsjtxietian/shader-crash

Browse source 
Fix editor crash when shader has incorrect global array declaration
This commit is contained in:
Rémi Verschelde 2024-07-26 13:43:57 +02:00
parent 7805220fef 38fad35356
commit a50cead712
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/rendering/shader_language.cpp
View file

@ -7411,6 +7411,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
return ERR_PARSE_ERROR;
}
tk = _get_token();
} else {
_set_expected_error("(");
return ERR_PARSE_ERROR;
}
}
} else {
@ -9520,6 +9523,9 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
_set_error(RTR("Array size mismatch."));
return ERR_PARSE_ERROR;
}
} else {
_set_expected_error("(");
return ERR_PARSE_ERROR;
}
array_size = constant.array_size;