merge trunk 17122:17213

[blender-staging.git] / source / blender / include / BIF_editarmature.h

diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index df2965f49930d947245ec966de116fb0d10a9972..4c3ba94ccc18c91007ec466075d06daa87257c99 100644 (file)
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -71,6 +71,8 @@ typedef struct EditBone
 EditBone *addEditBone(char *name, struct ListBase *ebones, struct bArmature *arm);
 
 float rollBoneToVector(EditBone *bone, float new_up_axis[3]);
+void   make_boneList(struct ListBase *list, struct ListBase *bones, EditBone *parent);
+void   editbones_to_armature (struct ListBase *list, struct Object *ob);
 
 void   adduplicate_armature(void);
 void   addvert_armature(void);
@@ -151,6 +153,15 @@ void       align_selected_bones(void);
 
 #define BONESEL_NOSEL  0x80000000      /* Indicates a negative number */
 
+/* from autoarmature */
+void BIF_retargetArmature();
+void BIF_adjustRetarget();
+void BIF_freeRetarget();
+
+struct ReebArc;
+float calcVariance(struct ReebArc *arc, int start, int end, float v0[3], float n[3]);
+float calcDistance(struct ReebArc *arc, int start, int end, float head[3], float tail[3]);
+
 /* useful macros */
 #define EBONE_VISIBLE(arm, ebone) ((arm->layer & ebone->layer) && !(ebone->flag & BONE_HIDDEN_A))
 #define EBONE_EDITABLE(ebone) ((ebone->flag & BONE_SELECTED) && !(ebone->flag & BONE_EDITMODE_LOCKED))