diff options
Diffstat (limited to 'extern/mantaflow/helper')
| -rw-r--r-- | extern/mantaflow/helper/pwrapper/registry.cpp | 4 | ||||
| -rw-r--r-- | extern/mantaflow/helper/pwrapper/registry.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/mantaflow/helper/pwrapper/registry.cpp b/extern/mantaflow/helper/pwrapper/registry.cpp index 3cdc2248b98..5b313e52fb4 100644 --- a/extern/mantaflow/helper/pwrapper/registry.cpp +++ b/extern/mantaflow/helper/pwrapper/registry.cpp @@ -192,7 +192,7 @@ int cbDisableConstructor(PyObject *self, PyObject *args, PyObject *kwds) return -1; } -PyMODINIT_FUNC PyInit_Main(void) +PyMODINIT_FUNC PyInit_manta_main(void) { MantaEnsureRegistration(); #if PY_MAJOR_VERSION >= 3 @@ -567,7 +567,7 @@ void WrapperRegistry::construct(const string &scriptname, const vector<string> & registerDummyTypes(); // work around for certain gcc versions, cast to char* - PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_Main); + PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_manta_main); } inline PyObject *castPy(PyTypeObject *p) diff --git a/extern/mantaflow/helper/pwrapper/registry.h b/extern/mantaflow/helper/pwrapper/registry.h index 139863df85d..d9d2bbb624b 100644 --- a/extern/mantaflow/helper/pwrapper/registry.h +++ b/extern/mantaflow/helper/pwrapper/registry.h @@ -62,7 +62,7 @@ void MantaEnsureRegistration(); #ifdef BLENDER # ifdef PyMODINIT_FUNC -PyMODINIT_FUNC PyInit_Main(void); +PyMODINIT_FUNC PyInit_manta_main(void); # endif #endif |