merge more etch-a-ton code. nothing works, but it compiles. Will try to get it working this week end.

1 files changed, 24 insertions, 1 deletions

diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index a6eb7be8615..d808e979880 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -112,7 +112,7 @@ void docenter_armature (struct Scene *scene, struct View3D *v3d, struct Object *
 
 void auto_align_armature(struct Scene *scene, struct View3D *v3d, short mode);
 void unique_editbone_name(struct ListBase *ebones, char *name, EditBone *bone); /* if bone is already in list, pass it as param to ignore it */
-void armature_bone_rename(Object *ob, char *oldnamep, char *newnamep);
+void armature_bone_rename(struct Object *ob, char *oldnamep, char *newnamep);
 
 void undo_push_armature(struct bContext *C, char *name);
 
@@ -122,6 +122,29 @@ void ED_armature_enter_posemode(struct bContext *C, struct Base *base);
 int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan);
 void ED_pose_deselectall(struct Object *ob, int test, int doundo);
 
+/* sketch */
+
+int BIF_paintSketch(struct bContext *C, short mbut);
+void BIF_endStrokeSketch(struct bContext *C);
+void BIF_convertSketch(struct bContext *C);
+void BIF_deleteSketch(struct bContext *C);
+void BIF_selectAllSketch(struct bContext *C, int mode); /* -1: deselect, 0: select, 1: toggle */
+int BIF_validSketchMode(struct bContext *C);
+int BIF_fullSketchMode(struct bContext *C); /* full sketch turned on (not Quick) */
+void BIF_cancelStrokeSketch(struct bContext *C);
+void BIF_sk_selectStroke(struct bContext *C, short mval[2], int extend);
+
+void  BIF_makeListTemplates(struct bContext *C);
+char *BIF_listTemplates(struct bContext *C);
+int   BIF_currentTemplate(struct bContext *C);
+void  BIF_freeTemplates(struct bContext *C);
+void  BIF_setTemplate(struct bContext *C, int index);
+int   BIF_nbJointsTemplate(struct bContext *C);
+char * BIF_nameBoneTemplate(struct bContext *C);
+
+void BDR_queueDrawSketch(struct bContext *C);
+void BDR_drawSketch(struct bContext *C);
+void BDR_drawSketchNames(struct bContext *C);
 
 #endif /* ED_ARMATURE_H */