diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2023-01-10 00:04:35 -0600 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2023-01-24 16:05:07 -0600 |
| commit | 2bc0bcbd26c809ce09f6c869515ce68d18120fdf (patch) | |
| tree | 2d1ef986203c14356e6be03224777e9eace59db0 /core | |
| parent | fab9926a958ffb5771c59a93f4416d3f3df45240 (diff) | |
PropertyUsage: Rename "DO_NOT_SHARE_ON_DUPLICATE" to "ALWAYS_DUPLICATE"
Diffstat (limited to 'core')
| -rw-r--r-- | core/core_constants.cpp | 2 | ||||
| -rw-r--r-- | core/io/resource.cpp | 2 | ||||
| -rw-r--r-- | core/object/object.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/core_constants.cpp b/core/core_constants.cpp index e28f7bfc4f..2da693dd98 100644 --- a/core/core_constants.cpp +++ b/core/core_constants.cpp @@ -586,7 +586,7 @@ void register_global_constants() { BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_CLASS_IS_ENUM); BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_NIL_IS_VARIANT); BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_ARRAY); - BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE); + BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_ALWAYS_DUPLICATE); BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_HIGH_END_GFX); BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT); BIND_CORE_BITFIELD_FLAG(PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT); diff --git a/core/io/resource.cpp b/core/io/resource.cpp index 6d3575b9fa..022e34ecc6 100644 --- a/core/io/resource.cpp +++ b/core/io/resource.cpp @@ -262,7 +262,7 @@ Ref<Resource> Resource::duplicate(bool p_subresources) const { if ((p.get_type() == Variant::DICTIONARY || p.get_type() == Variant::ARRAY)) { r->set(E.name, p.duplicate(p_subresources)); - } else if (p.get_type() == Variant::OBJECT && (p_subresources || (E.usage & PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE))) { + } else if (p.get_type() == Variant::OBJECT && (p_subresources || (E.usage & PROPERTY_USAGE_ALWAYS_DUPLICATE))) { Ref<Resource> sr = p; if (sr.is_valid()) { r->set(E.name, sr->duplicate(p_subresources)); diff --git a/core/object/object.h b/core/object/object.h index f78c7c34fd..92a8decb68 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -109,7 +109,7 @@ enum PropertyUsageFlags { PROPERTY_USAGE_CLASS_IS_ENUM = 1 << 16, PROPERTY_USAGE_NIL_IS_VARIANT = 1 << 17, PROPERTY_USAGE_ARRAY = 1 << 18, // Used in the inspector to group properties as elements of an array. - PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE = 1 << 19, // If the object is duplicated also this property will be duplicated. + PROPERTY_USAGE_ALWAYS_DUPLICATE = 1 << 19, // When duplicating a resource, always duplicate, even with subresource duplication disabled. PROPERTY_USAGE_HIGH_END_GFX = 1 << 20, PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT = 1 << 21, PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT = 1 << 22, |