kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fluid: Updated manta pp files

Browse Source 
Includes only a rename. The name PyInit_Main was a bit confusing as it just belongs to Manta.
This commit is contained in:
Sebastián Barschkis 2020-03-16 17:08:06 +01:00
parent 2ba3e6a02e
commit 7f3e84deb5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

2
extern/mantaflow/helper/pwrapper/registry.h vendored
View File

@ -62,7 +62,7 @@ void MantaEnsureRegistration();
#ifdef BLENDER
# ifdef PyMODINIT_FUNC
PyMODINIT_FUNC PyInit_Main(void);
PyMODINIT_FUNC PyInit_manta_main(void);
# endif
#endif

2
extern/mantaflow/preprocessed/gitinfo.h vendored
View File

@ -1,3 +1,3 @@
#define MANTA_GIT_VERSION "commit caae2ddea6ea895677aca88df00a130a67eeb6c7"
#define MANTA_GIT_VERSION "commit 5fbd3d04381b21afce4a593d1fe2d9bc7bef5424"

2
intern/mantaflow/intern/manta_python_API.cpp
View File

@ -26,5 +26,5 @@
PyObject *Manta_initPython(void)
{
return Pb::PyInit_Main();
return Pb::PyInit_manta_main();
}