TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 07:03:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: Fix bug sorting overloads of AsyncFuture::set_result()

Browse Source
This commit is contained in:
rdb 2021-03-01 10:59:02 +01:00
parent 89a1c8bff7
commit eab1308438
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -4283,18 +4283,19 @@ int get_type_sort(CPPType *type) {
TypeManager::is_struct(type)) { TypeManager::is_struct(type)) {
answer = 20; answer = 20;
int deepest = 0; int deepest = 0;
TypeIndex type_index = builder.get_type(TypeManager::unwrap(TypeManager::resolve_type(type)), false);
InterrogateDatabase *idb = InterrogateDatabase::get_ptr();
const InterrogateType &itype = idb->get_type(type_index);
if (itype.is_class() || itype.is_struct()) { // Sort such that more derived classes come first.
int num_derivations = itype.number_of_derivations(); type = TypeManager::unwrap(TypeManager::resolve_type(type));
for (int di = 0; di < num_derivations; di++) { if (type != nullptr) {
TypeIndex d_type_Index = itype.get_derivation(di); CPPStructType *struct_type = type->as_struct_type();
const InterrogateType &d_itype = idb->get_type(d_type_Index); if (struct_type != nullptr) {
int this_one = get_type_sort(d_itype._cpptype); for (const CPPStructType::Base &base : struct_type->_derivation) {
if (this_one > deepest) { if (base._base != nullptr) {
deepest = this_one; int this_one = get_type_sort(base._base);
if (this_one > deepest) {
deepest = this_one;
}
}
} }
} }
} }