godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55821 from Chaosus/shader_fix_semicolon

This commit is contained in:
Rémi Verschelde 2021-12-12 21:10:23 +01:00 committed by GitHub
parent f5aff3f9d1 8862d1426d
commit 6d58b968d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/rendering/shader_language.cpp
View File

@ -5314,7 +5314,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (tk.type == TK_CURSOR) { if (tk.type == TK_CURSOR) {
//do nothing //do nothing
} else if (tk.type == TK_IDENTIFIER) {
} else if (tk.type == TK_PERIOD) { } else if (tk.type == TK_PERIOD) {
DataType dt = expr->get_datatype(); DataType dt = expr->get_datatype();
String st = expr->get_datatype_name(); 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; block->parent_block = p_block;
cf->blocks.push_back(block); cf->blocks.push_back(block);
err = _parse_block(block, p_function_info, true, p_can_break, p_can_continue); err = _parse_block(block, p_function_info, true, p_can_break, p_can_continue);
if (err) {
return err;
}
} else { } else {
_set_tkpos(pos); //rollback _set_tkpos(pos); //rollback
} }