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

Fix global uniforms parsed as instance uniform

Browse Source
This commit is contained in:
Lily Garcia 2022-11-17 17:18:20 -05:00
parent 966785751f
commit 0683bc3783
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/shader_language.cpp
View File

@ -8190,6 +8190,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
}; };
[[fallthrough]]; [[fallthrough]];
case TK_INSTANCE: { case TK_INSTANCE: {
if (tk.type == TK_INSTANCE) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
keyword_completion_context = CF_UNIFORM_KEYWORD; keyword_completion_context = CF_UNIFORM_KEYWORD;
if (_lookup_next(next)) { if (_lookup_next(next)) {
@ -8210,6 +8211,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
} }
uniform_scope = ShaderNode::Uniform::SCOPE_INSTANCE; uniform_scope = ShaderNode::Uniform::SCOPE_INSTANCE;
} }
}
}; };
[[fallthrough]]; [[fallthrough]];
case TK_UNIFORM: case TK_UNIFORM: