*Changed some userpref options to enums.

*Tweaked curve UI slightly.

3 files changed, 15 insertions, 15 deletions

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 94ad073d0bb..70904239d86 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -96,27 +96,29 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 #		col.itemL(text="NORMALS")
 #		col.itemR(curve, "vertex_normal_flip")
 
-class DATA_PT_geometry_curve(DataButtonsPanelCurve):
-	__label__ = "Geometry "
+class DATA_PT_geometry_curve(DataButtonsPanel):
+	__label__ = "Geometry"
 
 	def draw(self, context):
 		layout = self.layout
 		
 		curve = context.curve
-		
+
 		split = layout.split()
 	
 		col = split.column()
 		col.itemL(text="Modification:")
 		col.itemR(curve, "width")
 		col.itemR(curve, "extrude")
-		col.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
+		col.itemL(text="Taper Object:")
+		col.itemR(curve, "taper_object", text="")
 		
 		col = split.column()
 		col.itemL(text="Bevel:")
 		col.itemR(curve, "bevel_depth", text="Depth")
 		col.itemR(curve, "bevel_resolution", text="Resolution")
-		col.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
+		col.itemL(text="Bevel Object:")
+		col.itemR(curve, "bevel_object", text="")
 
 	
 class DATA_PT_pathanim(DataButtonsPanelCurve):
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index d0e7ea09a92..2959f60a5f5 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -36,9 +36,7 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		
 		ob = context.object
 		curve = context.curve
-		space = context.space_data
-
-		layout.itemR(curve, "curve_2d")			
+		space = context.space_data		
 							
 		split = layout.split()
 		
@@ -55,8 +53,8 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		col = split.column()	
 		col.itemL(text="Resolution:")
 		sub = col.column(align=True)
-		sub.itemR(curve, "resolution_u", text="Preview U")
-		sub.itemR(curve, "render_resolution_u", text="Render U")
+		sub.itemR(curve, "resolution_u", text="Preview")
+		sub.itemR(curve, "render_resolution_u", text="Render")
 		
 		# resolution_v is not used for text
 		
diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index 1e7a9b581d4..cfdabadcee1 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -156,15 +156,15 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub = col.split(percentage=0.85)
 		
 		sub1 = sub.column()
-		sub1.itemL(text="Materials:")
-		sub1.itemR(edit, "material_linked_object", text="Linked to Object")
-		sub1.itemR(edit, "material_linked_obdata", text="Linked to ObData")
+		sub1.itemL(text="Link Materials To:")
+		sub1.row().itemR(edit, "material_link", expand=True)
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemL(text="New Objects:")
 		sub1.itemR(edit, "enter_edit_mode")
-		sub1.itemR(edit, "align_to_view")
+		sub1.itemL(text="Align To:")
+		sub1.row().itemR(edit, "object_align", expand=True)
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemS()
@@ -185,9 +185,9 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub1.itemL(text="Grease Pencil:")
 		sub1.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
 		sub1.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 		# sub1.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
 		sub1.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 		
 		col = split.column()
 		sub = col.split(percentage=0.85)