1 files changed, 47 insertions, 9 deletions

diff --git a/scene/property_list_helper.cpp b/scene/property_list_helper.cpp
index d9a80011b0..b666e4c52d 100644
--- a/scene/property_list_helper.cpp
+++ b/scene/property_list_helper.cpp
@@ -31,7 +31,7 @@
 #include "property_list_helper.h"
 
 const PropertyListHelper::Property *PropertyListHelper::_get_property(const String &p_property, int *r_index) const {
-	const Vector<String> components = p_property.split("/", true, 2);
+	const Vector<String> components = p_property.rsplit("/", true, 1);
 	if (components.size() < 2 || !components[0].begins_with(prefix)) {
 		return nullptr;
 	}
@@ -48,36 +48,73 @@ const PropertyListHelper::Property *PropertyListHelper::_get_property(const Stri
 }
 
 void PropertyListHelper::_call_setter(const MethodBind *p_setter, int p_index, const Variant &p_value) const {
+	DEV_ASSERT(p_setter);
 	Variant args[] = { p_index, p_value };
 	const Variant *argptrs[] = { &args[0], &args[1] };
 	Callable::CallError ce;
 	p_setter->call(object, argptrs, 2, ce);
 }
 
-Variant PropertyListHelper::_call_getter(const MethodBind *p_getter, int p_index) const {
+Variant PropertyListHelper::_call_getter(const Property *p_property, int p_index) const {
+	if (!p_property->getter) {
+		return object->get(prefix + itos(p_index) + "/" + p_property->info.name);
+	}
+
 	Callable::CallError ce;
 	Variant args[] = { p_index };
 	const Variant *argptrs[] = { &args[0] };
-	return p_getter->call(object, argptrs, 1, ce);
+	return p_property->getter->call(object, argptrs, 1, ce);
 }
 
 void PropertyListHelper::set_prefix(const String &p_prefix) {
 	prefix = p_prefix;
 }
 
+void PropertyListHelper::register_property(const PropertyInfo &p_info, const Variant &p_default) {
+	Property property;
+	property.info = p_info;
+	property.default_value = p_default;
+
+	property_list[p_info.name] = property;
+}
+
+bool PropertyListHelper::is_initialized() const {
+	return !property_list.is_empty();
+}
+
 void PropertyListHelper::setup_for_instance(const PropertyListHelper &p_base, Object *p_object) {
 	prefix = p_base.prefix;
 	property_list = p_base.property_list;
 	object = p_object;
 }
 
+bool PropertyListHelper::is_property_valid(const String &p_property, int *r_index) const {
+	const Vector<String> components = p_property.rsplit("/", true, 1);
+	if (components.size() < 2 || !components[0].begins_with(prefix)) {
+		return false;
+	}
+
+	{
+		const String index_string = components[0].trim_prefix(prefix);
+		if (!index_string.is_valid_int()) {
+			return false;
+		}
+
+		if (r_index) {
+			*r_index = index_string.to_int();
+		}
+	}
+
+	return property_list.has(components[1]);
+}
+
 void PropertyListHelper::get_property_list(List<PropertyInfo> *p_list, int p_count) const {
 	for (int i = 0; i < p_count; i++) {
 		for (const KeyValue<String, Property> &E : property_list) {
 			const Property &property = E.value;
 
 			PropertyInfo info = property.info;
-			if (_call_getter(property.getter, i) == property.default_value) {
+			if (_call_getter(&property, i) == property.default_value) {
 				info.usage &= (~PROPERTY_USAGE_STORAGE);
 			}
 
@@ -92,7 +129,7 @@ bool PropertyListHelper::property_get_value(const String &p_property, Variant &r
 	const Property *property = _get_property(p_property, &index);
 
 	if (property) {
-		r_ret = _call_getter(property->getter, index);
+		r_ret = _call_getter(property, index);
 		return true;
 	}
 	return false;
@@ -110,8 +147,7 @@ bool PropertyListHelper::property_set_value(const String &p_property, const Vari
 }
 
 bool PropertyListHelper::property_can_revert(const String &p_property) const {
-	int index;
-	return _get_property(p_property, &index) != nullptr;
+	return is_property_valid(p_property);
 }
 
 bool PropertyListHelper::property_get_revert(const String &p_property, Variant &r_value) const {
@@ -129,8 +165,10 @@ PropertyListHelper::~PropertyListHelper() {
 	// No object = it's the main helper. Do a cleanup.
 	if (!object) {
 		for (const KeyValue<String, Property> &E : property_list) {
-			memdelete(E.value.setter);
-			memdelete(E.value.getter);
+			if (E.value.setter) {
+				memdelete(E.value.setter);
+				memdelete(E.value.getter);
+			}
 		}
 	}
 }