== Armature Joining Bugfixes ==

Since 2.40 (and a few pre-releases around then), armature joining has not
worked correctly. Constraints and other attributes of bones in posemode
(IK DOF limits, transform locks, custom shapes, etc.) were not preserved
on the armature(s) that were joined onto the last selected armature. This
was a serious production problem, as it meant that you could not easily
add pre-made rig segments and merge them with the rest of your rigs without
having to redo all the constraints. After a few attempts, I've finally
managed to fix this.

All constraints and parenting relationships get name corrections for the post-
merge armatures. Action channels in actions don't really get any corrections
yet unless the action is being used by an Action Constraint.

Python-API people: beware, I may have broken something in this commit.

1 files changed, 2 insertions, 1 deletions

diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 9cdde5ffcb3..a48ca3bbe82 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -36,6 +36,7 @@ struct Object;
 struct Base;
 struct Bone;
 struct bArmature;
+struct ListBase;
 
 typedef struct EditBone
 {
@@ -105,7 +106,7 @@ void	remake_editArmature(void);
 void	selectconnected_armature(void);
 void	selectconnected_posearmature(void);
 void	select_bone_parent(void);
-void    unique_editbone_name (char* name);
+void    unique_editbone_name (struct ListBase *ebones, char* name);
 
 void	auto_align_armature(void);
 void	create_vgroups_from_armature(Object *ob, Object *par);