mirror of
https://github.com/godotengine/godot
synced 2024-09-04 21:38:30 +00:00
Merge pull request #15251 from binbitten/fix-assign-vardecl
Fix premature declaration of shader variables created with assignment
This commit is contained in:
commit
0b07d453f7
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue