Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-03 09:32:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #64721 from bruvzg/fix_prop_revet_ext

Browse Source
This commit is contained in:
Rémi Verschelde 2022-08-23 21:37:52 +02:00 committed by GitHub
commit 34aa6b06a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/object.cpp
View File

@ -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) {

4
core/object/object.h
View File

@ -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;

4
editor/editor_sectioned_inspector.cpp
View File

@ -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);
}