2.5 Buttons:

* Modifier Button tweaks by William Reynish. Thanks! 

1 files changed, 54 insertions, 37 deletions

diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 4ec57065c10..c087e5f5e36 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -108,21 +108,28 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		split = layout.split()
 		
 		col = split.column()
-		sub = col.column()
-		sub.itemR(md, "constant_offset")
-		sub.itemR(md, "constant_offset_displacement", text="Displacement")
-		sub = col.column()
+		col = col.column()
+		col.itemR(md, "constant_offset")
+		colsub = col.column()
+		colsub.active = md.constant_offset
+		colsub.itemR(md, "constant_offset_displacement", text="Displacement")
 		sub = col.row().itemR(md, "merge_adjacent_vertices", text="Merge")
-		sub = col.row().itemR(md, "merge_end_vertices", text="First Last")
-		sub = col.itemR(md, "merge_distance", text="Distance")
+		colsub = col.column()
+		colsub.active = md.merge_adjacent_vertices
+		colsub.itemR(md, "merge_end_vertices", text="First Last")
+		colsub.itemR(md, "merge_distance", text="Distance")
 		
 		col = split.column()
-		sub = col.column()
-		sub.itemR(md, "relative_offset")
-		sub.itemR(md, "relative_offset_displacement", text="Displacement")
-		sub = col.column()
-		sub.itemR(md, "add_offset_object")
-		sub.itemR(md, "offset_object")
+		col = col.column()
+		col.itemR(md, "relative_offset")
+		colsub = col.column()
+		colsub.active = md.relative_offset
+		colsub.itemR(md, "relative_offset_displacement", text="Displacement")
+		col = col.column()
+		col.itemR(md, "add_offset_object")
+		colsub = col.column()
+		colsub.active = md.add_offset_object
+		colsub.itemR(md, "offset_object")
 		
 		col = layout.column()
 		col.itemR(md, "start_cap")
@@ -148,13 +155,19 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		layout.itemR(md, "object")
 		
 	def build(self, layout, md):
-		layout.itemR(md, "start")
-		layout.itemR(md, "length")
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(md, "start")
+		col.itemR(md, "length")
 
-		layout.itemR(md, "randomize")
-		row = layout.row()
-		row.active = md.randomize
-		row.itemR(md, "seed")
+		col = split.column()
+		col.itemR(md, "randomize")
+		colsub = col.column()
+		colsub.active = md.randomize
+		colsub.itemR(md, "seed")
+			
+		
 			
 	def cast(self, layout, md):
 		layout.itemR(md, "cast_type")
@@ -195,11 +208,15 @@ class DATA_PT_modifiers(DataButtonsPanel):
 			layout.itemR(md, "uv_layer")
 	
 	def edgesplit(self, layout, md):
-		layout.itemR(md, "use_edge_angle", text="Edge Angle")
-		row = layout.row()
-		row.active = md.use_edge_angle
-		row.itemR(md, "split_angle")
-		layout.itemR(md, "use_sharp", text="Sharp Edges")
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(md, "use_edge_angle", text="Edge Angle")
+		colsub = col.column()
+		colsub.active = md.use_edge_angle
+		colsub.itemR(md, "split_angle")
+		col = split.column()
+		col.itemR(md, "use_sharp", text="Sharp Edges")
 		
 	def explode(self, layout, md):
 		layout.itemR(md, "vertex_group")
@@ -249,6 +266,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		sub.itemR(md, "y")
 		sub.itemR(md, "z")
 		sub = split.column()
+		sub.itemL(text="Textures:")
 		sub.itemR(md, "mirror_u")
 		sub.itemR(md, "mirror_v")
 		sub = split.column()
@@ -315,10 +333,9 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	def smooth(self, layout, md):
 		split = layout.split()
 		sub = split.column()
-		row = sub.row(align=True)
-		row.itemR(md, "x", toggle=True)
-		row.itemR(md, "y", toggle=True)
-		row.itemR(md, "z", toggle=True)
+		sub.itemR(md, "x")
+		sub.itemR(md, "y")
+		sub.itemR(md, "z")
 		sub = split.column()
 		sub.itemR(md, "factor")
 		sub.itemR(md, "repeat")
@@ -331,9 +348,9 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	def subsurf(self, layout, md):
 		layout.itemR(md, "subdivision_type")
 		col = layout.column_flow()
-		col.itemR(md, "levels")
-		col.itemR(md, "render_levels")
-		col.itemR(md, "optimal_draw")
+		col.itemR(md, "levels", text="Preview")
+		col.itemR(md, "render_levels", text="Render")
+		col.itemR(md, "optimal_draw", text="Optimal Display")
 		col.itemR(md, "subsurf_uv")
 	
 	def uvproject(self, layout, md):
@@ -354,13 +371,13 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		sub.itemR(md, "y")
 		sub.itemR(md, "cyclic")
 		
-		col = split.column()
-		col.itemR(md, "normals")
-		colsub = col.row(align=True)
-		colsub.active = md.normals
-		colsub.itemR(md, "x_normal", text="X", toggle=True)
-		colsub.itemR(md, "y_normal", text="Y", toggle=True)
-		colsub.itemR(md, "z_normal", text="Z", toggle=True)
+		sub = split.column()
+		sub.itemR(md, "normals")
+		row = sub.row(align=True)
+		row.active = md.normals
+		row.itemR(md, "x_normal", text="X", toggle=True)
+		row.itemR(md, "y_normal", text="Y", toggle=True)
+		row.itemR(md, "z_normal", text="Z", toggle=True)
 		
 		col = layout.column_flow()
 		col.itemR(md, "time_offset")