diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-10 11:23:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 11:23:18 +0100 |
| commit | 741bbb9d7c95dfd810c113ca935a8f16238b5334 (patch) | |
| tree | d3ecbe2a7932231469c4a32a68c3e69ed489d818 /core | |
| parent | 0f731701805b2fe8d26ab165ed2893108c706617 (diff) | |
| parent | c4770e1605deba7a74bbe16ec8574883d0d5f185 (diff) | |
Merge pull request #58690 from elmordo/bugfix-57553-gdextension-inheritance-fix
Diffstat (limited to 'core')
| -rw-r--r-- | core/object/object.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 387c765d73..096edd4e60 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -624,8 +624,12 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons } if (_extension) { - p_list->push_back(PropertyInfo(Variant::NIL, _extension->class_name, PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY)); - ClassDB::get_property_list(_extension->class_name, p_list, true, this); + const ObjectNativeExtension *current_extension = _extension; + while (current_extension) { + 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) { |