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:
authorCampbell Barton <ideasman42@gmail.com>2019-12-16 23:27:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-12-17 01:55:25 +0300
commit5d1245cca9e50a0e124f12b2f58b4ca362c1b4cb (patch)
tree15a32e0118a42a2cc7314db300c8c2a28bae6b2d /source/blender/python
parent7e15638cceaf570995ebd7fcd719914885202ccc (diff)
PyAPI: disable threading hack when fluid is disabled
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/intern/bpy_interface.c9
1 files changed, 5 insertions, 4 deletions
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;