From 5473c7e2224c489fde7375155d67e4470e7d1c81 Mon Sep 17 00:00:00 2001 From: kobewi Date: Thu, 22 Feb 2024 13:52:12 +0100 Subject: [PATCH] Fix implementation of property_can_revert() in PropertyListHelper --- doc/classes/Object.xml | 2 +- scene/property_list_helper.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/doc/classes/Object.xml b/doc/classes/Object.xml index bb27ea6eb73..0f8a458bae1 100644 --- a/doc/classes/Object.xml +++ b/doc/classes/Object.xml @@ -220,7 +220,7 @@ - Override this method to customize the given [param property]'s revert behavior. Should return [code]true[/code] if the [param property] can be reverted in the Inspector dock. Use [method _property_get_revert] to specify the [param property]'s default value. + Override this method to customize the given [param property]'s revert behavior. Should return [code]true[/code] if the [param property] has a custom default value and is revertible in the Inspector dock. Use [method _property_get_revert] to specify the [param property]'s default value. [b]Note:[/b] This method must return consistently, regardless of the current value of the [param property]. diff --git a/scene/property_list_helper.cpp b/scene/property_list_helper.cpp index 2d3179d9fd2..d9a80011b0c 100644 --- a/scene/property_list_helper.cpp +++ b/scene/property_list_helper.cpp @@ -111,12 +111,7 @@ bool PropertyListHelper::property_set_value(const String &p_property, const Vari bool PropertyListHelper::property_can_revert(const String &p_property) const { int index; - const Property *property = _get_property(p_property, &index); - - if (property) { - return _call_getter(property->getter, index) != property->default_value; - } - return false; + return _get_property(p_property, &index) != nullptr; } bool PropertyListHelper::property_get_revert(const String &p_property, Variant &r_value) const {