diff options
| author | binbitten <martinsjursen@gmail.com> | 2018-01-01 19:56:44 +0100 |
|---|---|---|
| committer | binbitten <martinsjursen@gmail.com> | 2018-01-03 07:23:04 +0100 |
| commit | f141bafba386e996b37e2e7486fc5881cb806bf7 (patch) | |
| tree | 701fc5503a232076f87cfd04f9c6ae393f277fce /servers/visual/shader_language.cpp | |
| parent | b50a9114b105dafafdda8248a38653bca314a6f3 (diff) | |
| download | redot-engine-f141bafba386e996b37e2e7486fc5881cb806bf7.tar.gz | |
Fix premature declaration of shader variables created with assignment
Diffstat (limited to 'servers/visual/shader_language.cpp')
| -rw-r--r-- | servers/visual/shader_language.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 1828cf8a4b..f0f93ff2a7 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -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) { |