godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79683 from Zylann/fix_gdext_get_property_list

Browse Source 
GDExtension: Fix `_get_property_list` not working correctly in parent classes
This commit is contained in:
Yuri Sizov 2023-07-26 18:40:18 +02:00
commit a68137bf18
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/object/object.cpp
View File

@ -486,19 +486,21 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
const ObjectGDExtension *current_extension = _extension; const ObjectGDExtension *current_extension = _extension;
while (current_extension) { while (current_extension) {
p_list->push_back(PropertyInfo(Variant::NIL, current_extension->class_name, PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY)); p_list->push_back(PropertyInfo(Variant::NIL, current_extension->class_name, PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
ClassDB::get_property_list(current_extension->class_name, p_list, true, this);
current_extension = current_extension->parent;
}
}
if (_extension && _extension->get_property_list) { ClassDB::get_property_list(current_extension->class_name, p_list, true, this);
if (current_extension->get_property_list) {
uint32_t pcount; uint32_t pcount;
const GDExtensionPropertyInfo *pinfo = _extension->get_property_list(_extension_instance, &pcount); const GDExtensionPropertyInfo *pinfo = current_extension->get_property_list(_extension_instance, &pcount);
for (uint32_t i = 0; i < pcount; i++) { for (uint32_t i = 0; i < pcount; i++) {
p_list->push_back(PropertyInfo(pinfo[i])); p_list->push_back(PropertyInfo(pinfo[i]));
} }
if (_extension->free_property_list) { if (current_extension->free_property_list) {
_extension->free_property_list(_extension_instance, pinfo); current_extension->free_property_list(_extension_instance, pinfo);
}
}
current_extension = current_extension->parent;
} }
} }