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:
authorThomas Dinges <blender@dingto.org>2013-04-28 20:52:51 +0400
committerThomas Dinges <blender@dingto.org>2013-04-28 20:52:51 +0400
commit674d82d783ed6cd664fec51acb7fcc451a505077 (patch)
tree2a4f3ec9ebbd499c5136dde451aa27b915b79280 /source/blender/python
parent608dc78241c98341c8fb4cab12d73f148adf0471 (diff)
Fluid UI:
* Display Simulation threads only, when built with OpenMP.
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/SConscript3
-rw-r--r--source/blender/python/intern/bpy_app_build_options.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 4fb6d771c5b..db5817e6b38 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -169,6 +169,9 @@ if env['WITH_BF_OIIO']:
if env['WITH_BF_PLAYER']:
defs.append('WITH_PLAYER')
+
+if env['WITH_BF_OPENMP']:
+ defs.append('WITH_OPENMP')
diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index 60105f73f37..87119fa690d 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -66,6 +66,7 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
{(char *)"collada", NULL},
{(char *)"opencolorio", NULL},
{(char *)"player", NULL},
+ {(char *)"openmp", NULL},
{NULL}
};
@@ -288,6 +289,12 @@ static PyObject *make_builtopts_info(void)
SetObjIncref(Py_False);
#endif
+#ifdef WITH_OPENMP
+ SetObjIncref(Py_True);
+#else
+ SetObjIncref(Py_False);
+#endif
+
#undef SetObjIncref
return builtopts_info;