[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56364] trunk/blender: Fluid UI:

[Thomas Dinges]

Revision: 56364
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56364
Author:   dingto
Date:     2013-04-28 16:52:51 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Fluid UI:
* Display Simulation threads only, when built with OpenMP. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    trunk/blender/source/blender/python/SConscript
    trunk/blender/source/blender/python/intern/bpy_app_build_options.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2013-04-28 15:37:18 UTC (rev 56363)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2013-04-28 16:52:51 UTC (rev 56364)
@@ -67,7 +67,10 @@
             # 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()

Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript	2013-04-28 15:37:18 UTC (rev 56363)
+++ trunk/blender/source/blender/python/SConscript	2013-04-28 16:52:51 UTC (rev 56364)
@@ -169,6 +169,9 @@
 
 if env['WITH_BF_PLAYER']:
     defs.append('WITH_PLAYER')
+    
+if env['WITH_BF_OPENMP']:
+    defs.append('WITH_OPENMP')
 
 
 

Modified: trunk/blender/source/blender/python/intern/bpy_app_build_options.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_build_options.c	2013-04-28 15:37:18 UTC (rev 56363)
+++ trunk/blender/source/blender/python/intern/bpy_app_build_options.c	2013-04-28 16:52:51 UTC (rev 56364)
@@ -66,6 +66,7 @@
 	{(char *)"collada", NULL},
 	{(char *)"opencolorio", NULL},
 	{(char *)"player", NULL},
+	{(char *)"openmp", NULL},
 	{NULL}
 };
 
@@ -288,6 +289,12 @@
 	SetObjIncref(Py_False);
 #endif
 
+#ifdef WITH_OPENMP
+	SetObjIncref(Py_True);
+#else
+	SetObjIncref(Py_False);
+#endif
+
 #undef SetObjIncref
 
 	return builtopts_info;