summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_parser.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-04-20 19:06:02 +0200
committerGitHub <noreply@github.com>2020-04-20 19:06:02 +0200
commit4e4fcbd79352b96210929eab8f6cd1670af0462a (patch)
tree780315e0e4a6e9d8d6aac5b00308faffc91dd5c8 /modules/gdscript/gdscript_parser.cpp
parent9cf48b3e995b40bba174f062d0d3f4249e8cdbf0 (diff)
parent2cd952bd846678c5e16d47ed0986c74c6b997e73 (diff)
downloadredot-engine-4e4fcbd79352b96210929eab8f6cd1670af0462a.tar.gz
Merge pull request #38045 from akien-mga/fix-subgroup-property
Fix handling of PROPERTY_USAGE_SUBGROUP in DocData and editor
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
-rw-r--r--modules/gdscript/gdscript_parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 8d34ce5c70..1c075fb6db 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -7364,7 +7364,7 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
}
}
-#define IS_USAGE_MEMBER(m_usage) (!(m_usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_CATEGORY)))
+#define IS_USAGE_MEMBER(m_usage) (!(m_usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_SUBGROUP | PROPERTY_USAGE_CATEGORY)))
// Check other script types
while (scr.is_valid()) {