[Bf-blender-cvs] [5d1245cca9e] master: PyAPI: disable threading hack when fluid is disabled
Campbell Barton
noreply at git.blender.org
Mon Dec 16 23:55:41 CET 2019
Commit: 5d1245cca9e50a0e124f12b2f58b4ca362c1b4cb
Author: Campbell Barton
Date: Tue Dec 17 07:27:09 2019 +1100
Branches: master
https://developer.blender.org/rB5d1245cca9e50a0e124f12b2f58b4ca362c1b4cb
PyAPI: disable threading hack when fluid is disabled
===================================================================
M source/blender/python/intern/bpy_interface.c
===================================================================
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index bbf9b03cdd7..9acf05abfe2 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -296,11 +296,12 @@ void BPY_python_start(int argc, const char **argv)
/* Initialize thread support (also acquires lock) */
PyEval_InitThreads();
- /* (sebbas): Required to prevent assertion error */
- /* see:
- * https://stackoverflow.com/questions/27844676/assertionerror-3-x-only-when-calling-py-finalize-with-threads
- */
+# ifdef WITH_FLUID
+ /* Required to prevent assertion error, see:
+ * https://stackoverflow.com/questions/27844676 */
Py_DECREF(PyImport_ImportModule("threading"));
+# endif
+
#else
(void)argc;
(void)argv;
More information about the Bf-blender-cvs
mailing list