diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2021-06-07 07:38:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 07:38:14 +0300 |
| commit | 34fc33d192150675050071d952f8601601563f31 (patch) | |
| tree | e42a7c92ffe661276c9326d703246693cfc5e26f | |
| parent | cb8244273b0038595d8be6e0d56a430feac217f0 (diff) | |
| parent | eec82d9f75395f86ac77d61c69d1066283e0554b (diff) | |
Merge pull request #49360 from Chaosus/fix_shader_crash
| -rw-r--r-- | servers/rendering/shader_language.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index f485d79fb0..8ed774f8e7 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -6375,13 +6375,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun } pass_array = false; - bool array_size_incorrect = false; - - if (b->parent_function->return_array_size > 0 && b->parent_function->return_array_size != expr->get_array_size()) { - array_size_incorrect = true; - } - - if (b->parent_function->return_type != expr->get_datatype() || array_size_incorrect || return_struct_name != expr->get_datatype_name()) { + if (b->parent_function->return_type != expr->get_datatype() || b->parent_function->return_array_size != expr->get_array_size() || return_struct_name != expr->get_datatype_name()) { _set_error("Expected return with an expression of type '" + (return_struct_name != "" ? return_struct_name : get_datatype_name(b->parent_function->return_type)) + array_size_string + "'"); return ERR_PARSE_ERROR; } |