From f141bafba386e996b37e2e7486fc5881cb806bf7 Mon Sep 17 00:00:00 2001
From: binbitten <martinsjursen@gmail.com>
Date: Mon, 1 Jan 2018 19:56:44 +0100
Subject: Fix premature declaration of shader variables created with assignment

---
 servers/visual/shader_language.cpp | 6 +++---
 1 file 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) {
-- 
cgit v1.2.3