godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Fix shader TIME auto-completion

Browse Source
This commit is contained in:
Yuri Roubinsky
2020-03-19 21:26:35 +03:00
parent 1a532d53cc
commit 523dae6bba
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/visual/shader_language.cpp
View File

@@ -6722,8 +6722,18 @@ Error ShaderLanguage::complete(const String &p_code, const Map<StringName, Funct
block = block->parent_block; block = block->parent_block;
} }
if (comp_ident && skip_function != StringName() && p_functions.has(skip_function)) { if (comp_ident) {
if (p_functions.has("global")) {
for (Map<StringName, BuiltInInfo>::Element *E = p_functions["global"].built_ins.front(); E; E = E->next()) {
ScriptCodeCompletionOption::Kind kind = ScriptCodeCompletionOption::KIND_MEMBER;
if (E->get().constant) {
kind = ScriptCodeCompletionOption::KIND_CONSTANT;
}
matches.insert(E->key(), kind);
}
}
if (skip_function != StringName() && p_functions.has(skip_function)) {
for (Map<StringName, BuiltInInfo>::Element *E = p_functions[skip_function].built_ins.front(); E; E = E->next()) { for (Map<StringName, BuiltInInfo>::Element *E = p_functions[skip_function].built_ins.front(); E; E = E->next()) {
ScriptCodeCompletionOption::Kind kind = ScriptCodeCompletionOption::KIND_MEMBER; ScriptCodeCompletionOption::Kind kind = ScriptCodeCompletionOption::KIND_MEMBER;
if (E->get().constant) { if (E->get().constant) {
@@ -6733,7 +6743,6 @@ Error ShaderLanguage::complete(const String &p_code, const Map<StringName, Funct
} }
} }
if (comp_ident) {
for (const Map<StringName, ShaderNode::Varying>::Element *E = shader->varyings.front(); E; E = E->next()) { for (const Map<StringName, ShaderNode::Varying>::Element *E = shader->varyings.front(); E; E = E->next()) {
matches.insert(E->key(), ScriptCodeCompletionOption::KIND_VARIABLE); matches.insert(E->key(), ScriptCodeCompletionOption::KIND_VARIABLE);
} }