svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / release / ui / buttons_data_bone.py
index 17c9c2d89d986a167b840539c86b779313f88d50..1d6a725a105c6c24d051ae9fca39cd194a2130a9 100644 (file)
@@ -74,10 +74,13 @@ class BONE_PT_bone(BoneButtonsPanel):
        def draw(self, context):
                layout = self.layout
                
+               ob = context.object
                bone = context.bone
                arm = context.armature
                if not bone:
                        bone = context.edit_bone
+               else:
+                       pchan = ob.pose.pose_channels[context.bone.name]
 
                split = layout.split()
 
@@ -103,6 +106,17 @@ class BONE_PT_bone(BoneButtonsPanel):
                col.itemR(bone, "draw_wire", text="Wireframe")
                col.itemR(bone, "hidden", text="Hide")
 
+               if ob and pchan:
+                       split = layout.split()
+                       
+                       col = split.column()
+                       col.itemL(text="Bone Group:")
+                       col.item_pointerR(pchan, "bone_group", ob.pose, "bone_groups", text="")
+                       
+                       col = split.column()
+                       col.itemL(text="Custom Shape:")
+                       col.itemR(pchan, "custom_shape", text="")
+
 class BONE_PT_inverse_kinematics(BoneButtonsPanel):
        __label__ = "Inverse Kinematics"
        __default_closed__ = True