1 files changed, 31 insertions, 55 deletions
diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/ui/properties_data_armature.py
index bded38ee3cc..b7864618de6 100644
--- a/release/scripts/ui/properties_data_armature.py
+++ b/release/scripts/ui/properties_data_armature.py
@@ -12,7 +12,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
 
@@ -158,56 +158,12 @@ class DATA_PT_bone_groups(DataButtonsPanel):
         row.active = (ob.proxy is None)
 
         row.operator("pose.group_assign", text="Assign")
-        row.operator("pose.group_remove", text="Remove") #row.operator("pose.bone_group_remove_from", text="Remove")
+        row.operator("pose.group_unassign", text="Remove") #row.operator("pose.bone_group_remove_from", text="Remove")
         #row.operator("object.bone_group_select", text="Select")
         #row.operator("object.bone_group_deselect", text="Deselect")
 
 
-class DATA_PT_paths(DataButtonsPanel):
-    bl_label = "Paths"
-
-    def draw(self, context):
-        layout = self.layout
-
-        arm = context.armature
-        wide_ui = context.region.width > narrowui
-
-        if wide_ui:
-            layout.prop(arm, "paths_type", expand=True)
-        else:
-            layout.prop(arm, "paths_type", text="")
-
-        split = layout.split()
-
-        col = split.column()
-        sub = col.column(align=True)
-        if (arm.paths_type == 'CURRENT_FRAME'):
-            sub.prop(arm, "path_before_current", text="Before")
-            sub.prop(arm, "path_after_current", text="After")
-        elif (arm.paths_type == 'RANGE'):
-            sub.prop(arm, "path_start_frame", text="Start")
-            sub.prop(arm, "path_end_frame", text="End")
-
-        sub.prop(arm, "path_size", text="Step")
-        col.row().prop(arm, "paths_location", expand=True)
-
-        if wide_ui:
-            col = split.column()
-        col.label(text="Display:")
-        col.prop(arm, "paths_show_frame_numbers", text="Frame Numbers")
-        col.prop(arm, "paths_highlight_keyframes", text="Keyframes")
-        col.prop(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
-
-        layout.separator()
-
-        split = layout.split()
-
-        col = split.column()
-        col.operator("pose.paths_calculate", text="Calculate Paths")
-
-        if wide_ui:
-            col = split.column()
-        col.operator("pose.paths_clear", text="Clear Paths")
+# TODO: this panel will soon be depreceated too
 
 
 class DATA_PT_ghost(DataButtonsPanel):
@@ -297,13 +253,33 @@ class DATA_PT_iksolver_itasc(DataButtonsPanel):
                 row.prop(itasc, "dampmax", text="Damp", slider=True)
                 row.prop(itasc, "dampeps", text="Eps", slider=True)
 
+# import generic panels from other files 
+from properties_animviz import DATA_PT_motion_paths, DATA_PT_onion_skinning
+
+classes = [
+    DATA_PT_context_arm,
+    DATA_PT_skeleton,
+    DATA_PT_display,
+    DATA_PT_bone_groups,
+    DATA_PT_ghost,
+    DATA_PT_iksolver_itasc,
+
+    DATA_PT_motion_paths,
+    #DATA_PT_onion_skinning,
+
+    DATA_PT_custom_props_arm]
+
+
+def register():
+    register = bpy.types.register
+    for cls in classes:
+        register(cls)
+
 
-bpy.types.register(DATA_PT_context_arm)
-bpy.types.register(DATA_PT_skeleton)
-bpy.types.register(DATA_PT_display)
-bpy.types.register(DATA_PT_bone_groups)
-bpy.types.register(DATA_PT_paths)
-bpy.types.register(DATA_PT_ghost)
-bpy.types.register(DATA_PT_iksolver_itasc)
+def unregister():
+    unregister = bpy.types.unregister
+    for cls in classes:
+        unregister(cls)
 
-bpy.types.register(DATA_PT_custom_props_arm)
+if __name__ == "__main__":
+    register()