griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #129926: Crash with Python 3.12 & Manta flow

Browse Source 
Python 3.12 no longer supports calls to PyImport_AppendInittab
once initialized.

The call was redundant as Blender's `bpy_internal_modules` already
includes the "manta" module.

Resolve by disabling the call when Python's lifecycle isn't being
managed by manta-flow.
This commit is contained in:
Campbell Barton
2024-11-28 12:04:45 +11:00
parent 4c34b25f56
commit 1865de1c73
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extern/mantaflow/helper/pwrapper/registry.cpp vendored
View File

@@ -112,7 +112,7 @@ class WrapperRegistry {
const std::string &name,
Manta::PbArgs &args,
Manta::PbClass *parent);
void construct(const std::string &scriptname, const vector<string> &args);
void construct(bool python_lifecycle, const std::string &scriptname, const vector<string> &args);
void cleanup();
void renameObjects();
void runPreInit(PyObject *name_space);
@@ -566,7 +566,9 @@ PyObject *WrapperRegistry::createPyObject(const string &classname,
}
// prepare typeinfo and register python module
void WrapperRegistry::construct(const string &scriptname, const vector<string> &args)
void WrapperRegistry::construct(const bool python_lifecycle,
const string &scriptname,
const vector<string> &args)
{
mScriptName = scriptname;
this->args = args;
@@ -575,8 +577,15 @@ void WrapperRegistry::construct(const string &scriptname, const vector<string> &
registerMeta();
registerDummyTypes();
// work around for certain gcc versions, cast to char*
PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_manta_main);
// Don't extend the init-tab when Python is already initialized.
// Since Python 3.12 this isn't supported and will crash.
//
// When `python_lifecycle` is false (when manta-flow is embedded), it's the responsibility
// of the application embedding this code to include #PyInit_manta_main in the init-tab.
if (python_lifecycle) {
// work around for certain gcc versions, cast to char*
PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_manta_main);
}
}
inline PyObject *castPy(PyTypeObject *p)
@@ -711,7 +720,7 @@ void setup(const bool python_lifecycle,
const std::vector<std::string> &args,
PyObject *name_space)
{
WrapperRegistry::instance().construct(filename, args);
WrapperRegistry::instance().construct(python_lifecycle, filename, args);
if (python_lifecycle) {
Py_Initialize();
}