Armature UI

Added the new pose tools in the toolbar.
Changed a few armature values to enums. 

Brecht: The Heads/Tails enum seems to also enable armature.draw_axis, and the paths_type enum affects armature.draw_names

2 files changed, 17 insertions, 11 deletions

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 5924a2eb4ea..49da9c190ff 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -121,28 +121,31 @@ class DATA_PT_paths(DataButtonsPanel):
 		layout = self.layout
 		
 		arm = context.armature
-
+		
+		layout.itemR(arm, "paths_type", expand=True)
+		
 		split = layout.split()
 		
 		col = split.column()
-		col.itemR(arm, "paths_show_around_current_frame", text="Around Frame")
 		
 		sub = col.column(align=True)
-		if (arm.paths_show_around_current_frame):
+		if (arm.paths_type == 'CURRENT_FRAME'):
 			sub.itemR(arm, "path_before_current", text="Before")
 			sub.itemR(arm, "path_after_current", text="After")
-		else:
+		elif (arm.paths_type == 'RANGE'):
 			sub.itemR(arm, "path_start_frame", text="Start")
 			sub.itemR(arm, "path_end_frame", text="End")
 
-		sub.itemR(arm, "path_size", text="Step")	
-		col.itemR(arm, "paths_calculate_head_positions", text="Head")
+		sub.itemR(arm, "path_size", text="Step")
+		col.row().itemR(arm, "paths_location", expand=True)
 		
 		col = split.column()
 		col.itemL(text="Show:")
 		col.itemR(arm, "paths_show_frame_numbers", text="Frame Numbers")
 		col.itemR(arm, "paths_highlight_keyframes", text="Keyframes")
 		col.itemR(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
+		
+		layout.itemO("pose.paths_calculate")
 
 class DATA_PT_ghost(DataButtonsPanel):
 	__label__ = "Ghost"
@@ -151,11 +154,12 @@ class DATA_PT_ghost(DataButtonsPanel):
 		layout = self.layout
 		
 		arm = context.armature
-
+		
+		layout.itemR(arm, "ghost_type", expand=True)
+		
 		split = layout.split()
 
 		col = split.column()
-		col.itemR(arm, "ghost_type", text="")
 
 		sub = col.column(align=True)
 		if arm.ghost_type == 'RANGE':
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 9492437b863..415a3e223bb 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -299,11 +299,13 @@ class VIEW3D_PT_tools_posemode(View3DPanel):
 		col.itemL(text="Pose:")
 		col.itemO("pose.copy", text="Copy")
 		col.itemO("pose.paste", text="Paste")
+		col.itemO("poselib.pose_add", text="Add To library")
 		
 		col = layout.column(align=True)
-		col.itemL(text="Library:")
-		col.itemO("poselib.pose_add", text="Add")
-		col.itemO("poselib.pose_remove", text="Remove")
+		col.itemL(text="In-Between:")
+		col.itemO("pose.relax", text="Relax")
+		col.itemO("pose.push", text="Push")
+		col.itemO("pose.breakdown", text="Breakdowner")
 		
 		col = layout.column(align=True)
 		col.itemL(text="Repeat:")