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

Backport 2f0bc01 to 1.9: Fix bug causing random crash during module initialization

Browse Source
This commit is contained in:
rdb 2016-06-22 15:04:00 +02:00
parent bf26cecb32
commit 0821bec2d0
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1198,6 +1198,10 @@ write_sub_module(ostream &out, Object *obj) {
if (!isExportThisRun(wrapped_itype._cpptype)) { if (!isExportThisRun(wrapped_itype._cpptype)) {
_external_imports.insert(wrapped_itype._cpptype); _external_imports.insert(wrapped_itype._cpptype);
} else {
// If this is a typedef to a class defined in the same module, make sure
// that the class is initialized before we try to define the typedef.
out << " Dtool_PyModuleClassInit_" << class_name << "(module);\n";
} }
} }
@ -2595,6 +2599,12 @@ write_module_class(ostream &out, Object *obj) {
out << "#if PY_VERSION_HEX >= 0x02050000\n"; out << "#if PY_VERSION_HEX >= 0x02050000\n";
write_function_slot(out, 2, slots, "nb_index"); write_function_slot(out, 2, slots, "nb_index");
out << "#endif\n"; out << "#endif\n";
out << "#if PY_VERSION_HEX >= 0x03050000\n";
write_function_slot(out, 2, slots, "nb_matrix_multiply");
write_function_slot(out, 2, slots, "nb_inplace_matrix_multiply");
out << "#endif\n";
out << "};\n\n"; out << "};\n\n";
// NB: it's tempting not to write this table when a class doesn't have them. // NB: it's tempting not to write this table when a class doesn't have them.
@ -2843,6 +2853,10 @@ write_module_class(ostream &out, Object *obj) {
out << "#if PY_VERSION_HEX >= 0x02060000\n"; out << "#if PY_VERSION_HEX >= 0x02060000\n";
out << " 0, // tp_version_tag\n"; out << " 0, // tp_version_tag\n";
out << "#endif\n"; out << "#endif\n";
// destructor tp_finalize
out << "#if PY_VERSION_HEX >= 0x03040000\n";
out << " 0, // tp_finalize\n";
out << "#endif\n";
out << " },\n"; out << " },\n";
out << " Dtool_UpcastInterface_" << ClassName << ",\n"; out << " Dtool_UpcastInterface_" << ClassName << ",\n";
out << " Dtool_DowncastInterface_" << ClassName << ",\n"; out << " Dtool_DowncastInterface_" << ClassName << ",\n";