[Bf-blender-cvs] [7f3e84deb5a] master: Fluid: Updated manta pp files

[Sebastián Barschkis]

Commit: 7f3e84deb5aff74106c29965b70664cdb9883ed8
Author: Sebastián Barschkis
Date:   Mon Mar 16 17:08:06 2020 +0100
Branches: master
https://developer.blender.org/rB7f3e84deb5aff74106c29965b70664cdb9883ed8

Fluid: Updated manta pp files

Includes only a rename. The name PyInit_Main was a bit confusing as it just belongs to Manta.

===================================================================

M	extern/mantaflow/helper/pwrapper/registry.cpp
M	extern/mantaflow/helper/pwrapper/registry.h
M	extern/mantaflow/preprocessed/gitinfo.h
M	intern/mantaflow/intern/manta_python_API.cpp

===================================================================

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"
diff --git a/intern/mantaflow/intern/manta_python_API.cpp b/intern/mantaflow/intern/manta_python_API.cpp
index 8f7a396410a..a905e045fd3 100644
--- a/intern/mantaflow/intern/manta_python_API.cpp
+++ b/intern/mantaflow/intern/manta_python_API.cpp
@@ -26,5 +26,5 @@
 
 PyObject *Manta_initPython(void)
 {
-  return Pb::PyInit_Main();
+  return Pb::PyInit_manta_main();
 }