diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-23 21:37:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 21:37:52 +0200 |
| commit | 34aa6b06a7002469ee54541067ce3c39bf42815a (patch) | |
| tree | a630152960ad7aac1c354c13aaa95c572fa72a32 | |
| parent | fc0b6abe52cb4e3312a4a9161849614184cf2d3b (diff) | |
| parent | 56101080cc05f6eb2fc782f6443c99f0669d00f6 (diff) | |
Merge pull request #64721 from bruvzg/fix_prop_revet_ext
| -rw-r--r-- | core/object/object.cpp | 4 | ||||
| -rw-r--r-- | core/object/object.h | 4 | ||||
| -rw-r--r-- | editor/editor_sectioned_inspector.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 5203685c7f..c75c36be4b 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -519,7 +519,7 @@ void Object::validate_property(PropertyInfo &p_property) const { _validate_propertyv(p_property); } -bool Object::property_can_revert(const String &p_name) const { +bool Object::property_can_revert(const StringName &p_name) const { if (script_instance) { if (script_instance->property_can_revert(p_name)) { return true; @@ -543,7 +543,7 @@ bool Object::property_can_revert(const String &p_name) const { return _property_can_revertv(p_name); } -Variant Object::property_get_revert(const String &p_name) const { +Variant Object::property_get_revert(const StringName &p_name) const { Variant ret; if (script_instance) { diff --git a/core/object/object.h b/core/object/object.h index 093b104664..26ae8af678 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -805,8 +805,8 @@ public: void get_property_list(List<PropertyInfo> *p_list, bool p_reversed = false) const; void validate_property(PropertyInfo &p_property) const; - bool property_can_revert(const String &p_name) const; - Variant property_get_revert(const String &p_name) const; + bool property_can_revert(const StringName &p_name) const; + Variant property_get_revert(const StringName &p_name) const; bool has_method(const StringName &p_method) const; void get_method_list(List<MethodInfo> *p_list) const; diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index cbca3e9dcd..1faefb5af7 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -113,11 +113,11 @@ class SectionedInspectorFilter : public Object { } } - bool property_can_revert(const String &p_name) { + bool property_can_revert(const StringName &p_name) { return edited->property_can_revert(section + "/" + p_name); } - Variant property_get_revert(const String &p_name) { + Variant property_get_revert(const StringName &p_name) { return edited->property_get_revert(section + "/" + p_name); } |