Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-03-09 17:09:07 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-09 19:11:24 +0300
commit81c18c2507484985be2d18a013badf4e3ea35d67 (patch)
tree0e8daba54177b8822ef533b581e175e306202c95
parent29b405a32784f260d81d4acb1e154a17f4ccc155 (diff)
Fix part of T73921: hang with Eevee light baking and Mantaflow
Now it crashes instead.
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 37d92de155e..9d24f880983 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -2297,18 +2297,24 @@ static PyObject *callPythonFunction(std::string varName,
// Get pyobject that holds result value
main = PyImport_ImportModule("__main__");
- if (!main)
+ if (!main) {
+ PyGILState_Release(gilstate);
return nullptr;
+ }
var = PyObject_GetAttrString(main, varName.c_str());
- if (!var)
+ if (!var) {
+ PyGILState_Release(gilstate);
return nullptr;
+ }
func = PyObject_GetAttrString(var, functionName.c_str());
Py_DECREF(var);
- if (!func)
+ if (!func) {
+ PyGILState_Release(gilstate);
return nullptr;
+ }
if (!isAttribute) {
returnedValue = PyObject_CallObject(func, nullptr);