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

Merge pull request #15251 from binbitten/fix-assign-vardecl 

Fix premature declaration of shader variables created with assignment
This commit is contained in:
Rémi Verschelde 2018-01-04 15:17:10 +01:00 committed by GitHub
parent e315c94900 f141bafba3
commit 0b07d453f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/visual/shader_language.cpp
View File

@ -3209,8 +3209,6 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
var.precision = precision;
var.line = tk_line;
p_block->variables[name] = var;
VariableDeclarationNode::Declaration decl;
decl.name = name;
@ -3219,7 +3217,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
tk = _get_token();
if (tk.type == TK_OP_ASSIGN) {
//variable creted with assignment! must parse an expression
//variable created with assignment! must parse an expression
Node *n = _parse_and_reduce_expression(p_block, p_builtin_types);
if (!n)
return ERR_PARSE_ERROR;
@ -3233,6 +3231,8 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
tk = _get_token();
}
p_block->variables[name] = var;
vardecl->declarations.push_back(decl);
if (tk.type == TK_COMMA) {