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

PropertyEditor: Filter out resource_local_to_scene 

This lets the empty "Global" category disappear again.
Also silence a debug print.
This commit is contained in:
Rémi Verschelde 2017-12-09 23:46:38 +01:00
parent f09e2cf094
commit 028f959fb1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gles3/shader_compiler_gles3.cpp
View File

@ -230,7 +230,6 @@ void ShaderCompilerGLES3::_dump_function_deps(SL::ShaderNode *p_node, const Stri
for (Set<StringName>::Element *E = p_node->functions[fidx].uses_function.front(); E; E = E->next()) { for (Set<StringName>::Element *E = p_node->functions[fidx].uses_function.front(); E; E = E->next()) {
print_line(String(p_node->functions[fidx].name) + " uses function: " + String(E->get()));
if (added.has(E->get())) { if (added.has(E->get())) {
continue; //was added already continue; //was added already
} }

4
editor/property_editor.cpp
View File

@ -4362,7 +4362,7 @@ class SectionedPropertyEditorFilter : public Object {
PropertyInfo pi = E->get(); PropertyInfo pi = E->get();
int sp = pi.name.find("/"); int sp = pi.name.find("/");
if (pi.name == "resource_path" || pi.name == "resource_name" || pi.name.begins_with("script/")) //skip resource stuff if (pi.name == "resource_path" || pi.name == "resource_name" || pi.name == "resource_local_to_scene" || pi.name.begins_with("script/")) //skip resource stuff
continue; continue;
if (sp == -1) { if (sp == -1) {
@ -4512,7 +4512,7 @@ void SectionedPropertyEditor::update_category_list() {
else if (!(pi.usage & PROPERTY_USAGE_EDITOR)) else if (!(pi.usage & PROPERTY_USAGE_EDITOR))
continue; continue;
if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path") if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path" || pi.name == "resource_local_to_scene")
continue; continue;
if (search_box && search_box->get_text() != String() && pi.name.findn(search_box->get_text()) == -1) if (search_box && search_box->get_text() != String() && pi.name.findn(search_box->get_text()) == -1)