[Bf-blender-cvs] [4d0a91d03d1] master: Fluid: Ensure GIL in conversion function

Sebastián Barschkis noreply at git.blender.org
Sat Dec 21 00:35:46 CET 2019


Commit: 4d0a91d03d1cb5d4dc8ed87c8aa97d9da2193c1a
Author: Sebastián Barschkis
Date:   Sat Dec 21 00:35:23 2019 +0100
Branches: master
https://developer.blender.org/rB4d0a91d03d1cb5d4dc8ed87c8aa97d9da2193c1a

Fluid: Ensure GIL in conversion function

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

M	intern/mantaflow/intern/MANTA_main.cpp

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

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 0828fae5351..52d40407e0d 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -2028,10 +2028,14 @@ static PyObject *callPythonFunction(std::string varName,
 
 static char *pyObjectToString(PyObject *inputObject)
 {
+  PyGILState_STATE gilstate = PyGILState_Ensure();
+
   PyObject *encoded = PyUnicode_AsUTF8String(inputObject);
   char *result = PyBytes_AsString(encoded);
   Py_DECREF(encoded);
   Py_DECREF(inputObject);
+
+  PyGILState_Release(gilstate);
   return result;
 }



More information about the Bf-blender-cvs mailing list