summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-04-20 16:32:45 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-04-20 17:13:06 +0200
commit2cd952bd846678c5e16d47ed0986c74c6b997e73 (patch)
tree780315e0e4a6e9d8d6aac5b00308faffc91dd5c8 /editor
parent9cf48b3e995b40bba174f062d0d3f4249e8cdbf0 (diff)
Fix handling of PROPERTY_USAGE_SUBGROUP in DocData and editor
Subgroups were added in #37678 but not properly handled everywhere where PROPERTY_USAGE_GROUP is.
Diffstat (limited to 'editor')
-rw-r--r--editor/doc_data.cpp2
-rw-r--r--editor/plugins/script_text_editor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/doc_data.cpp b/editor/doc_data.cpp
index 55abc4ff2e..a71427d6fc 100644
--- a/editor/doc_data.cpp
+++ b/editor/doc_data.cpp
@@ -277,7 +277,7 @@ void DocData::generate(bool p_basic_types) {
EO = EO->next();
}
- if (E->get().usage & PROPERTY_USAGE_GROUP || E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_INTERNAL)
+ if (E->get().usage & PROPERTY_USAGE_GROUP || E->get().usage & PROPERTY_USAGE_SUBGROUP || E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_INTERNAL)
continue;
PropertyDoc prop;
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 4b8383e1e5..1a77eeb9de 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -172,7 +172,7 @@ void ScriptTextEditor::_update_member_keywords() {
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
String name = E->get().name;
- if (E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_GROUP)
+ if (E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_GROUP || E->get().usage & PROPERTY_USAGE_SUBGROUP)
continue;
if (name.find("/") != -1)
continue;