diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-16 19:08:06 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-17 13:57:04 +0300 |
| commit | 7f3e84deb5aff74106c29965b70664cdb9883ed8 (patch) | |
| tree | 4ff8464263442864104bbfffd9d5e710ed199ef5 /extern | |
| parent | 2ba3e6a02e5c15b5532d82e64cc6214149272e8e (diff) | |
Fluid: Updated manta pp files
Includes only a rename. The name PyInit_Main was a bit confusing as it just belongs to Manta.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/mantaflow/helper/pwrapper/registry.cpp | 4 | ||||
| -rw-r--r-- | extern/mantaflow/helper/pwrapper/registry.h | 2 | ||||
| -rw-r--r-- | extern/mantaflow/preprocessed/gitinfo.h | 2 |
3 files changed, 4 insertions, 4 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 diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h index 574b655d6ce..208d8008a7e 100644 --- a/extern/mantaflow/preprocessed/gitinfo.h +++ b/extern/mantaflow/preprocessed/gitinfo.h @@ -1,3 +1,3 @@ -#define MANTA_GIT_VERSION "commit caae2ddea6ea895677aca88df00a130a67eeb6c7" +#define MANTA_GIT_VERSION "commit 5fbd3d04381b21afce4a593d1fe2d9bc7bef5424" |