Browse Source

Merge pull request #88665 from KoBeWi/nice_help_bro

Fix implementation of `property_can_revert()` in PropertyListHelper
Rémi Verschelde 1 year ago
parent
commit
c17f3d7c05
2 changed files with 2 additions and 7 deletions
  1. 1 1
      doc/classes/Object.xml
  2. 1 6
      scene/property_list_helper.cpp

+ 1 - 1
doc/classes/Object.xml

@@ -220,7 +220,7 @@
 			<return type="bool" />
 			<return type="bool" />
 			<param index="0" name="property" type="StringName" />
 			<param index="0" name="property" type="StringName" />
 			<description>
 			<description>
-				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].
 				[b]Note:[/b] This method must return consistently, regardless of the current value of the [param property].
 			</description>
 			</description>
 		</method>
 		</method>

+ 1 - 6
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 {
 bool PropertyListHelper::property_can_revert(const String &p_property) const {
 	int index;
 	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 {
 bool PropertyListHelper::property_get_revert(const String &p_property, Variant &r_value) const {