diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-12 21:10:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 21:10:23 +0100 |
| commit | 6d58b968d5dbfd458bf41b81e3b2dc688f0d5495 (patch) | |
| tree | 3e67c76e4e877701bb8e795aac6c86a1282d28fc | |
| parent | f5aff3f9d1bb29afd8d356c8f403a82f3b6fafbe (diff) | |
| parent | 8862d1426d1a9fb6476665df55eaf876f8a9e31d (diff) | |
Merge pull request #55821 from Chaosus/shader_fix_semicolon
| -rw-r--r-- | servers/rendering/shader_language.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 0c0ee67962..b077501a38 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -5314,7 +5314,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons if (tk.type == TK_CURSOR) { //do nothing - } else if (tk.type == TK_IDENTIFIER) { } else if (tk.type == TK_PERIOD) { DataType dt = expr->get_datatype(); String st = expr->get_datatype_name(); @@ -6931,7 +6930,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun block->parent_block = p_block; cf->blocks.push_back(block); err = _parse_block(block, p_function_info, true, p_can_break, p_can_continue); - + if (err) { + return err; + } } else { _set_tkpos(pos); //rollback } |