diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-11-08 11:30:02 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-11-08 11:30:59 -0300 |
| commit | f2e54057aec3a4e4fbb9f9da5729915deb2f4648 (patch) | |
| tree | 664e4d0ee569a4f9f2a9254771168949a2e35b14 /core/object.cpp | |
| parent | e7cb47e686368b462a5aec62379dcfb1c6d7a821 (diff) | |
| download | redot-engine-f2e54057aec3a4e4fbb9f9da5729915deb2f4648.tar.gz | |
-Moved EditorDefaultValue to ClassDB, made it core
-Removed one and zero hints for properties, replaced by default value
Diffstat (limited to 'core/object.cpp')
| -rw-r--r-- | core/object.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/object.cpp b/core/object.cpp index 374e10726a..6a6749f3b8 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -636,10 +636,11 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons #ifdef TOOLS_ENABLED p_list->push_back(PropertyInfo(Variant::NIL, "Script", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP)); #endif - p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NONZERO)); + p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT)); + } + if (!metadata.empty()) { + p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL)); } - if (!metadata.empty()) - p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_STORE_IF_NONZERO)); 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); |