Merged changes in the trunk up to revision 51853.
[blender-staging.git] / release / scripts / startup / bl_ui / properties_render.py
index 33ce0e07f177ff13b4369c2e934e69ddd7b73088..aa7d78225d5be91e427ba355dc4f29ef27da0624 100644 (file)
@@ -228,11 +228,13 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel):
         split = layout.split()
 
         col = split.column()
-        col.label(text="Threads:")
-        col.row().prop(rd, "threads_mode", expand=True)
-        sub = col.column()
-        sub.enabled = rd.threads_mode == 'FIXED'
-        sub.prop(rd, "threads")
+        sub = col.column(align=True)
+        sub.label(text="Threads:")
+        sub.row().prop(rd, "threads_mode", expand=True)
+        subsub = sub.column()
+        subsub.enabled = rd.threads_mode == 'FIXED'
+        subsub.prop(rd, "threads")
+        
         sub = col.column(align=True)
         sub.label(text="Tiles:")
         sub.prop(rd, "parts_x", text="X")