Merge pull request #55822 from Chaosus/shader_fix_semicolon_3.x

godotengine · Dec 12, 2021 · 4ebee76 · 4ebee76
2 parents dd122e2 + 933fd6b
commit 4ebee76
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
@@ -3694,7 +3694,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();
@@ -5071,7 +5070,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
 				block->parent_block = p_block;
 				cf->blocks.push_back(block);
 				err = _parse_block(block, p_builtin_types, true, p_can_break, p_can_continue);
-
+				if (err) {
+					return err;
+				}
 			} else {
 				_set_tkpos(pos); //rollback
 			}