kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fluid UI:

Browse Source 
* Display Simulation threads only, when built with OpenMP.
This commit is contained in:
Thomas Dinges 2013-04-28 16:52:51 +00:00
parent 608dc78241
commit 674d82d783
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/properties_physics_fluid.py
View File

@ -67,7 +67,10 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
# odd formatting here so translation script can extract string
layout.operator("fluid.bake", text=iface_("Bake (Req. Memory: %s)") % fluid.memory_estimate,
translate=False, icon='MOD_FLUIDSIM')
layout.prop(fluid, "threads", text="Simulation Threads")
if bpy.app.build_options.openmp:
layout.prop(fluid, "threads", text="Simulation Threads")
split = layout.split()
col = split.column()

3
source/blender/python/SConscript
View File

@ -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')

7
source/blender/python/intern/bpy_app_build_options.c
View File

@ -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;