diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-11-23 10:59:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-23 10:59:16 +0100 |
commit | bf341bf430a8a968e25a7138248e0182ab849d1a (patch) | |
tree | 0f69bd21d200753a46e34d4c209866cdae3936d6 /servers/rendering/shader_language.cpp | |
parent | e32dbb987b78dfa25468d475c009ec9ee36a27dc (diff) | |
parent | c7043dbfdccf32f9ccef707cd58e5b3ea3784d89 (diff) |
Merge pull request #55249 from Chaosus/shader_fix_return
Diffstat (limited to 'servers/rendering/shader_language.cpp')
-rw-r--r-- | servers/rendering/shader_language.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 1a994548d8..f865aab677 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -7190,11 +7190,6 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun //check return type BlockNode *b = p_block; - if (b && b->parent_function && p_function_info.main_function) { - _set_error(vformat("Using 'return' in '%s' processor function results in undefined behavior!", b->parent_function->name)); - return ERR_PARSE_ERROR; - } - while (b && !b->parent_function) { b = b->parent_block; } @@ -7204,6 +7199,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun return ERR_BUG; } + if (b && b->parent_function && p_function_info.main_function) { + _set_error(vformat("Using 'return' in '%s' processor function results in undefined behavior!", b->parent_function->name)); + return ERR_PARSE_ERROR; + } + String return_struct_name = String(b->parent_function->return_struct_name); String array_size_string; |