From c012fbc8b235b86ed70c501834825d91292f8811 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 3 Nov 2021 23:06:17 +0100 Subject: Rename `PROPERTY_USAGE_NOEDITOR` to `PROPERTY_USAGE_NO_EDITOR` This is consistent with other constants that include `NO`, such as `PROPERTY_HINT_COLOR_NO_ALPHA`. --- core/object/object.cpp | 2 +- core/object/object.h | 2 +- core/object/script_language.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/object') diff --git a/core/object/object.cpp b/core/object/object.cpp index e7d8b0e543..476fdec1f7 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -645,7 +645,7 @@ void Object::get_property_list(List *p_list, bool p_reversed) cons p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT)); } if (!metadata.is_empty()) { - p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL)); + p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL)); } if (script_instance && !p_reversed) { p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY)); diff --git a/core/object/object.h b/core/object/object.h index 759e2ccdee..218bc26dec 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -137,7 +137,7 @@ enum PropertyUsageFlags { PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK, PROPERTY_USAGE_DEFAULT_INTL = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK | PROPERTY_USAGE_INTERNATIONALIZED, - PROPERTY_USAGE_NOEDITOR = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK, + PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK, }; #define ADD_SIGNAL(m_signal) ::ClassDB::add_signal(get_class_static(), m_signal) diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp index b0ce46ca2b..c2449e3ddc 100644 --- a/core/object/script_language.cpp +++ b/core/object/script_language.cpp @@ -549,7 +549,7 @@ void PlaceHolderScriptInstance::property_set_fallback(const StringName &p_name, } } if (!found) { - properties.push_back(PropertyInfo(p_value.get_type(), p_name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_SCRIPT_VARIABLE)); + properties.push_back(PropertyInfo(p_value.get_type(), p_name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_SCRIPT_VARIABLE)); } } -- cgit v1.2.3