2.5 Buttons:

* Some minor layout cleanup. 

3 files changed, 36 insertions, 37 deletions

diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index 2005481d38b..e23215da931 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -200,16 +200,16 @@ class DATA_PT_spot(DataButtonsPanel):
 		split = layout.split()
 		
 		sub = split.column()
+		sub.itemR(lamp, "spot_size", text="Size")
+		sub.itemR(lamp, "spot_blend", text="Blend")
 		sub.itemR(lamp, "square")
-		sub.itemR(lamp, "spot_size")
-		sub.itemR(lamp, "spot_blend")
 		
 		sub = split.column()
 		sub.itemR(lamp, "halo")
 		if lamp.halo:
-			sub.itemR(lamp, "halo_intensity")
+			sub.itemR(lamp, "halo_intensity", text="Intensity")
 			if lamp.shadow_method == 'BUFFER_SHADOW':
-				sub.itemR(lamp, "halo_step")
+				sub.itemR(lamp, "halo_step", text="Step")
 
 bpy.types.register(DATA_PT_lamp)
 bpy.types.register(DATA_PT_shadow)
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 01066947332..63e1624d6db 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -150,30 +150,28 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
 
 		split = layout.split()
 		
-		sub = split.column()
-		sub.itemL(text="General Settings:")
-		sub.itemR(halo, "size")
-		sub.itemR(halo, "hardness")
-		sub.itemR(halo, "add", slider=True)
-		
-		sub = split.column()
+		col = split.column(align=True)
+		col.itemL(text="General Settings:")
+		col.itemR(halo, "size")
+		col.itemR(halo, "hardness")
+		col.itemR(halo, "add", slider=True)
+		
+		col.itemL(text="Options:")
+		col.itemR(halo, "use_texture", text="Texture")
+		col.itemR(halo, "use_vertex_normal", text="Vertex Normal")
+		col.itemR(halo, "xalpha")
+		col.itemR(halo, "shaded")
+		col.itemR(halo, "soft")
+
+		col = split.column()
+		sub = col.column(align=True)
 		sub.itemL(text="Elements:")
 		sub.itemR(halo, "ring")
 		sub.itemR(halo, "lines")
 		sub.itemR(halo, "star")
 		sub.itemR(halo, "flare_mode")
-
-		row = layout.row()
 		
-		sub = row.column()
-		sub.itemL(text="Options:")
-		sub.itemR(halo, "use_texture", text="Texture")
-		sub.itemR(halo, "use_vertex_normal", text="Vertex Normal")
-		sub.itemR(halo, "xalpha")
-		sub.itemR(halo, "shaded")
-		sub.itemR(halo, "soft")
-	
-		sub = row.column()
+		sub = col.column()
 		if (halo.ring):
 			sub.itemR(halo, "rings")
 		if (halo.lines):
@@ -183,6 +181,7 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
 		if (halo.star):
 			sub.itemR(halo, "star_tips")
 		if (halo.flare_mode):
+			sub = col.column(align=True)
 			sub.itemL(text="Flare:")
 			sub.itemR(halo, "flare_size", text="Size")
 			sub.itemR(halo, "flare_subsize", text="Subsize")
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index f3ab661a678..28a24f2f953 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -114,19 +114,17 @@ class RENDER_PT_render(RenderButtonsPanel):
 		if rd.do_composite:
 			row = layout.row()
 			row.itemR(rd, "free_image_textures")
-		
-		row = layout.row()
-		row.itemL(text="Threads:")
-		row.itemL(text="Tiles:")
-		
+
 		split = layout.split()
 		
 		sub = split.column(align=True)
+		sub.itemL(text="Threads:")
 		sub.row().itemR(rd, "threads_mode", expand=True)
 		if rd.threads_mode == 'THREADS_FIXED':
 			sub.itemR(rd, "threads")
 		
 		sub = split.column(align=True)
+		sub.itemL(text="Tiles:")
 		sub.itemR(rd, "parts_x", text="X")
 		sub.itemR(rd, "parts_y", text="Y")
 		
@@ -146,19 +144,21 @@ class RENDER_PT_dimensions(RenderButtonsPanel):
 		
 		split = layout.split()
 		
-		col = split.column(align=True)
-		col.itemL(text="Resolution:")
-		col.itemR(rd, "resolution_x", text="X")
-		col.itemR(rd, "resolution_y", text="Y")
-		col.itemR(rd, "resolution_percentage", text="")
+		col = split.column()
+		sub = col.column(align=True)
+		sub.itemL(text="Resolution:")
+		sub.itemR(rd, "resolution_x", text="X")
+		sub.itemR(rd, "resolution_y", text="Y")
+		sub.itemR(rd, "resolution_percentage", text="")
 		
-		col.itemL(text="Aspect Ratio:")
-		col.itemR(rd, "pixel_aspect_x", text="X")
-		col.itemR(rd, "pixel_aspect_y", text="Y")
+		sub.itemL(text="Aspect Ratio:")
+		sub.itemR(rd, "pixel_aspect_x", text="X")
+		sub.itemR(rd, "pixel_aspect_y", text="Y")
 		
-		col.itemR(rd, "border", text="Border")
+		sub = col.column()
+		sub.itemR(rd, "border", text="Border")
 		if rd.border:
-			col.itemR(rd, "crop_to_border")
+			sub.itemR(rd, "crop_to_border")
 
 		col = split.column(align=True)
 		col.itemL(text="Frame Range:")