Merge pull request #30611 from Chaosus/local_array_init_fix

Allows to use non-constants in the local shader array initializer
This commit is contained in:
Yuri Roubinsky 2019-07-16 09:11:59 +03:00 committed by GitHub
commit 6b9d502195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3958,10 +3958,6 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
if (!n) {
return ERR_PARSE_ERROR;
}
if (n->type != Node::TYPE_CONSTANT) {
_set_error("Expected constant expression in the array declaration");
return ERR_PARSE_ERROR;
}
if (var.type != n->get_datatype()) {
_set_error("Invalid assignment of '" + get_datatype_name(n->get_datatype()) + "' to '" + get_datatype_name(var.type) + "'");