summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-12-17 14:24:53 +0100
committerGitHub <noreply@github.com>2017-12-17 14:24:53 +0100
commitdbae2d98e3ea1441673e5b3506e7a73bed72eb07 (patch)
tree58ee64ae5a7c110d31c12107a1f508fc648fe16b /servers
parent6afb90c84658b08c3aa96e2baabb4ba24c92cb48 (diff)
parent8e2a1ffd6ee5fccd7d7a6c42b524dfa443a2d3a3 (diff)
Merge pull request #14528 from AlmightyScientist/issue-14456
Shader Language: Add in-for declared variables within for-block scope.
Diffstat (limited to 'servers')
-rw-r--r--servers/visual/shader_language.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index c69bbb9343..47e6190cea 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -3426,7 +3426,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
}
BlockNode *block = alloc_node<BlockNode>();
- block->parent_block = p_block;
+ block->parent_block = init_block;
cf->blocks.push_back(block);
p_block->statements.push_back(cf);