godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #2865 from hurikhan/pr_fix_2791

Browse Source 
Added additional token checks for the shader if..else.. statement.
This commit is contained in:
Juan Linietsky
2015-12-08 17:09:58 -03:00
parent ff936c6b2e 49f4ec2b71
commit 38ab47d2f9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
servers/visual/shader_language.cpp
View File

@@ -2341,19 +2341,27 @@ Error ShaderLanguage::parse_flow_if(Parser& parser,Node *p_parent,Node **r_state
parser.advance();
if (parser.get_token_type()!=TK_CURLY_BRACKET_OPEN) {
parser.set_error("Expected statement block after 'if()'");
return ERR_PARSE_ERROR;
}
Node *substatement=NULL;
err = parse_statement(parser,cf,&substatement);
if (err)
return err;
cf->statements.push_back(substatement);
if (parser.get_token_type()==TK_CF_ELSE) {
parser.advance();
if (parser.get_token_type()!=TK_CURLY_BRACKET_OPEN) {
parser.set_error("Expected statement block after 'else'");
return ERR_PARSE_ERROR;
}
substatement=NULL;
err = parse_statement(parser,cf,&substatement);
if (err)