[Bf-blender-cvs] [81c18c25074] master: Fix part of T73921: hang with Eevee light baking and Mantaflow
Brecht Van Lommel
noreply at git.blender.org
Mon Mar 9 17:12:08 CET 2020
Commit: 81c18c2507484985be2d18a013badf4e3ea35d67
Author: Brecht Van Lommel
Date: Mon Mar 9 15:09:07 2020 +0100
Branches: master
https://developer.blender.org/rB81c18c2507484985be2d18a013badf4e3ea35d67
Fix part of T73921: hang with Eevee light baking and Mantaflow
Now it crashes instead.
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
===================================================================
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);
More information about the Bf-blender-cvs
mailing list