diff options
| author | RedMser <redmser.jj2@gmail.com> | 2022-11-29 02:42:19 +0100 |
|---|---|---|
| committer | RedMser <redmser.jj2@gmail.com> | 2023-03-27 08:10:35 +0200 |
| commit | ed960453b721e62e8e2c37a4695a78f7b0a862d8 (patch) | |
| tree | 1608fce23ae15d7c0011336e741b70db99de2a52 /editor | |
| parent | 9b0bee860f4d53614c218d28c9c32f88cf8b5cff (diff) | |
| download | redot-engine-ed960453b721e62e8e2c37a4695a78f7b0a862d8.tar.gz | |
Make solving project setting errors easier
Show full project setting path in error messages.
Force filtering for advanced settings if filter is not empty.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_inspector.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_sectioned_inspector.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 44426dc143..532aa5bd7a 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2731,7 +2731,8 @@ void EditorInspector::update_tree() { List<PropertyInfo>::Element *N = E_property->next(); bool valid = true; while (N) { - if (!N->get().name.begins_with("metadata/_") && N->get().usage & PROPERTY_USAGE_EDITOR && (!restrict_to_basic || (N->get().usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { + if (!N->get().name.begins_with("metadata/_") && N->get().usage & PROPERTY_USAGE_EDITOR && + (!filter.is_empty() || !restrict_to_basic || (N->get().usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { break; } if (N->get().usage & PROPERTY_USAGE_CATEGORY) { @@ -2821,7 +2822,8 @@ void EditorInspector::update_tree() { continue; - } else if (p.name.begins_with("metadata/_") || !(p.usage & PROPERTY_USAGE_EDITOR) || _is_property_disabled_by_feature_profile(p.name) || (restrict_to_basic && !(p.usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { + } else if (p.name.begins_with("metadata/_") || !(p.usage & PROPERTY_USAGE_EDITOR) || _is_property_disabled_by_feature_profile(p.name) || + (filter.is_empty() && restrict_to_basic && !(p.usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { // Ignore properties that are not supposed to be in the inspector. continue; } diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index 3988d356b3..8716a75efd 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -239,7 +239,8 @@ void SectionedInspector::update_category_list() { for (PropertyInfo &pi : pinfo) { if (pi.usage & PROPERTY_USAGE_CATEGORY) { continue; - } else if (!(pi.usage & PROPERTY_USAGE_EDITOR) || (restrict_to_basic && !(pi.usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { + } else if (!(pi.usage & PROPERTY_USAGE_EDITOR) || + (filter_text.is_empty() && restrict_to_basic && !(pi.usage & PROPERTY_USAGE_EDITOR_BASIC_SETTING))) { continue; } |