Changes to openmp threads commit (UI and RNA)

- use same names as render threads
- remove OpenMP from UI
- remove details from tips

1 files changed, 6 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 70ebf6aac79..7b1055758e0 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1284,7 +1284,7 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
     def draw(self, context):
         layout = self.layout
         scene = context.scene
-		
+
         toolsettings = context.tool_settings
         sculpt = toolsettings.sculpt
         capabilities = sculpt.brush.sculpt_capabilities
@@ -1294,13 +1294,13 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
         col.label(text="Gravity:")
         col.prop(sculpt, "gravity", slider=True, text="Factor")
         col.prop(sculpt, "gravity_object")
-		
+
         col.separator()
-        col.label(text="OpenMP Threads:")
-        col.row(align=True).prop(scene, "omp_mode", expand=True)
+        col.label(text="Threads:")
+        col.row(align=True).prop(scene, "omp_threads_mode", expand=True)
         sub = col.column(align=True)
-        sub.enabled = scene.omp_mode == 'MANUAL'
-        sub.prop(scene, "omp_num_threads")
+        sub.enabled = (scene.omp_threads_mode != 'AUTO')
+        sub.prop(scene, "omp_threads")
         col.separator()
 
         layout.prop(sculpt, "use_threaded", text="Threaded Sculpt")