svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender

1 files changed, 9 insertions, 1 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index 96e10919806..708f485a0f8 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -74,6 +74,7 @@ class DATA_PT_skeleton(ArmatureButtonsPanel, Panel):
         if context.scene.render.engine == "BLENDER_GAME":
             layout.row().prop(arm, "vert_deformer", expand=True)
 
+
 class DATA_PT_display(ArmatureButtonsPanel, Panel):
     bl_label = _("Display")
 
@@ -185,9 +186,12 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel):
         layout.template_ID(ob, "pose_library", new="poselib.new", unlink="poselib.unlink")
 
         if poselib:
+            # list of poses in pose library
             row = layout.row()
             row.template_list(poselib, "pose_markers", poselib.pose_markers, "active_index", rows=5)
 
+            # column of operators for active pose
+            # - goes beside list
             col = row.column(align=True)
             col.active = (poselib.library is None)
 
@@ -203,7 +207,11 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel):
                 col.operator("poselib.pose_remove", icon='ZOOMOUT', text="").pose = pose_marker_active.name
                 col.operator("poselib.apply_pose", icon='ZOOM_SELECTED', text="").pose_index = poselib.pose_markers.active_index
 
-            layout.operator("poselib.action_sanitise")
+            col.operator("poselib.action_sanitise", icon='HELP', text="")  # XXX: put in menu?
+
+            # properties for active marker
+            if pose_marker_active is not None:
+                layout.prop(pose_marker_active, "name")
 
 
 # TODO: this panel will soon be depreceated too