Merge pull request #37187 from Chaosus/shader_fix

Fix incorrect shader block parsing

Merge pull request #37187 from Chaosus/shader_fix
cce0a27e · Yuri Roubinsky · GitHub · 2772840a · 50729e4e · cce0a27e
Unverified Commit cce0a27e authored Mar 20, 2020 by Yuri Roubinsky Committed by GitHub Mar 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

shader_language.cpp servers/visual/shader_language.cpp +3 -1

No files found.
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -5083,7 +5083,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
 			//a sub block, just because..
 			BlockNode *block = alloc_node<BlockNode>();
 			block->parent_block = p_block;
-			_parse_block(block, p_builtin_types, false, p_can_break, p_can_continue);
+			if (_parse_block(block, p_builtin_types, false, p_can_break, p_can_continue) != OK) {
+				return ERR_PARSE_ERROR;
+			}
 			p_block->statements.push_back(block);
 		} else if (tk.type == TK_CF_IF) {
 			//if () {}