Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #37187 from Chaosus/shader_fix

Browse Source 
Fix incorrect shader block parsing
This commit is contained in:
Yuri Roubinsky 2020-03-20 17:45:48 +03:00 committed by GitHub
commit cce0a27ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/visual/shader_language.cpp
View File

@ -5083,7 +5083,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
//a sub block, just because.. //a sub block, just because..
BlockNode *block = alloc_node<BlockNode>(); BlockNode *block = alloc_node<BlockNode>();
block->parent_block = p_block; 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); p_block->statements.push_back(block);
} else if (tk.type == TK_CF_IF) { } else if (tk.type == TK_CF_IF) {
//if () {} //if () {}