Mantaflow: call MANTA::terminateMantaflow on exit

terminateMantaflow was never called, this leak is more of a technicality
since it's only called on exit.

Also make Py_Initialize/Py_Finalize optional in Pd:setup/finalize
as it caused Blender to crash, finalizing Python twice.

Add a patch to extern/mantaflow to keep track of changes in Blender
from up-stream.

1 files changed, 4 insertions, 2 deletions

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 000bc313ab1..f1bdc10e7f9 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -562,6 +562,8 @@ MANTA::~MANTA()
   pythonCommands.push_back(finalString);
   result = runPythonString(pythonCommands);
 
+  MANTA::terminateMantaflow();
+
   BLI_assert(result);
   UNUSED_VARS(result);
 }
@@ -692,7 +694,7 @@ void MANTA::initializeMantaflow()
 
   PyObject *manta_main_module = manta_python_main_module_ensure();
   PyObject *globals_dict = PyModule_GetDict(manta_main_module);
-  Pb::setup(filename, fill, globals_dict); /* Namespace from Mantaflow (registry). */
+  Pb::setup(false, filename, fill, globals_dict); /* Namespace from Mantaflow (registry). */
   PyGILState_Release(gilstate);
 }
 
@@ -702,7 +704,7 @@ void MANTA::terminateMantaflow()
     cout << "Fluid: Releasing Mantaflow framework" << endl;
 
   PyGILState_STATE gilstate = PyGILState_Ensure();
-  Pb::finalize(); /* Namespace from Mantaflow (registry). */
+  Pb::finalize(false); /* Namespace from Mantaflow (registry). */
   manta_python_main_module_clear();
   PyGILState_Release(gilstate);
 }