diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-22 12:23:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 12:23:19 +0200 |
| commit | 7b7c459106e1bc86aa40dd77db0314c3f36fe82b (patch) | |
| tree | 5b91b161273866eba71fa2f0352d31ff6c96271d /core/object.cpp | |
| parent | 5f243b0a745d14c28a3a08fb9b1840aaa23eb079 (diff) | |
| parent | 9f5b77acc9f3ee739e17d05d767edbff1b6bf6ea (diff) | |
Merge pull request #30749 from godotengine/revert-22642-inspector_metadata
Revert "Expose "meta" to the Inspector"
Diffstat (limited to 'core/object.cpp')
| -rw-r--r-- | core/object.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/object.cpp b/core/object.cpp index 67ab27c190..3367d6b6c3 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -635,12 +635,9 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons #endif p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT)); } - -#ifdef TOOLS_ENABLED - p_list->push_back(PropertyInfo(Variant::NIL, "Metadata", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP)); -#endif - p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT)); - + if (!metadata.empty()) { + p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL)); + } if (script_instance && !p_reversed) { p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY)); script_instance->get_property_list(p_list); |