Clear some compiler warnings by commenting some functions, adding others to headers.

left in warnings where functions obviously need to get ported to 2.5x still.

Also, render stamp seq strip works again.

7 files changed, 29 insertions, 18 deletions

diff --git a/source/blender/editors/armature/BIF_retarget.h b/source/blender/editors/armature/BIF_retarget.h
index acdf07b6466..b1b7c38bddc 100644
--- a/source/blender/editors/armature/BIF_retarget.h
+++ b/source/blender/editors/armature/BIF_retarget.h
@@ -157,4 +157,8 @@ int RIG_nbJoints(RigGraph *rg);
 const char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index);
 void RIG_freeRigGraph(BGraph *rg);
 
+/* UNUSED */
+void BIF_retargetArmature(bContext *C);
+void BIF_adjustRetarget(bContext *C);
+
 #endif /* BIF_RETARGET_H */
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 23584df1d74..2bd840e2c1d 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -3392,8 +3392,9 @@ void ARMATURE_OT_reveal(wmOperatorType *ot)
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
 
+}
+#if 0 // remove this?
 static void hide_selected_armature_bones(Scene *scene)
 {
 	Object *obedit= scene->obedit; // XXX get from context
@@ -3412,8 +3413,6 @@ static void hide_selected_armature_bones(Scene *scene)
 	ED_armature_sync_selection(arm->edbo);
 }
 
-
-#if 0 // remove this?
 static void hide_unselected_armature_bones(Scene *scene)
 {
 	Object *obedit= scene->obedit; // XXX get from context
@@ -3433,9 +3432,7 @@ static void hide_unselected_armature_bones(Scene *scene)
 	ED_armature_validate_active(arm);
 	ED_armature_sync_selection(arm->edbo);
 }
-#endif
 
-#if 0 // remove this?
 void show_all_armature_bones(Scene *scene)
 {
 	Object *obedit= scene->obedit; // XXX get from context
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
index 14eb3133435..a0e465525b2 100644
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ b/source/blender/editors/armature/editarmature_retarget.c
@@ -1656,6 +1656,7 @@ static EditBone *add_editbonetolist(char *name, ListBase *list)
 }
 #endif
 
+#if 0 /* UNUSED */
 static void generateMissingArcsFromNode(RigGraph *rigg, ReebNode *node, int multi_level_limit)
 {
 	while (node->multi_level > multi_level_limit && node->link_up)
@@ -1708,6 +1709,7 @@ static void generateMissingArcs(RigGraph *rigg)
 		}
 	}
 }
+#endif
 
 /************************************ RETARGETTING *****************************************************/
 
@@ -2799,7 +2801,7 @@ static void BIF_freeRetarget(void)
 	}
 }
 
-static void BIF_retargetArmature(bContext *C)
+void BIF_retargetArmature(bContext *C)
 {
 	ReebGraph *reebg;
 	double start_time, end_time;
@@ -2932,7 +2934,7 @@ void BIF_retargetArc(bContext *C, ReebArc *earc, RigGraph *template_rigg)
 //	allqueue(REDRAWVIEW3D, 0);
 }
 
-static void BIF_adjustRetarget(bContext *C)
+void BIF_adjustRetarget(bContext *C)
 {
 	if (GLOBAL_RIGG)
 	{
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c
index 8e1206ad0b3..c0b77b5feef 100644
--- a/source/blender/editors/armature/editarmature_sketch.c
+++ b/source/blender/editors/armature/editarmature_sketch.c
@@ -76,7 +76,10 @@ typedef struct SK_GestureAction {
 	GestureApplyFct		apply;
 } SK_GestureAction;
 
+#if 0 /* UNUSED 2.5 */
 static SK_Point boneSnap;
+#endif
+
 static int    LAST_SNAP_POINT_VALID = 0;
 static float  LAST_SNAP_POINT[3];
 
@@ -727,6 +730,7 @@ static SK_Point *sk_snapPointStroke(bContext *C, SK_Stroke *stk, short mval[2],
 	return pt;
 }
 
+#if 0 /* UNUSED 2.5 */
 static SK_Point *sk_snapPointArmature(bContext *C, Object *ob, ListBase *ebones, short mval[2], int *dist)
 {
 	ARegion *ar = CTX_wm_region(C);
@@ -774,6 +778,7 @@ static SK_Point *sk_snapPointArmature(bContext *C, Object *ob, ListBase *ebones,
 
 	return pt;
 }
+#endif
 
 void sk_resetOverdraw(SK_Sketch *sketch)
 {
@@ -2198,6 +2203,7 @@ static int sk_selectStroke(bContext *C, SK_Sketch *sketch, short mval[2], int ex
 	return 0;
 }
 
+#if 0 /* UNUSED 2.5 */
 static void sk_queueRedrawSketch(SK_Sketch *sketch)
 {
 	if (sketch->active_stroke != NULL)
@@ -2211,6 +2217,7 @@ static void sk_queueRedrawSketch(SK_Sketch *sketch)
 		}
 	}
 }
+#endif
 
 static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch, int with_names)
 {
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 24f92e2dbbb..c122460e5bb 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -71,13 +71,6 @@
 
 #include "armature_intern.h"
 
-/* ************* XXX *************** */
-static int pupmenu(const char *UNUSED(dummy)) {return 0;}
-static void error(const char *UNUSED(dummy)) {}
-static void BIF_undo_push(const char *UNUSED(dummy)) {}
-/* ************* XXX *************** */
-
-
 static int object_pose_context(Object *ob)
 {
 	if(	(ob) && 
@@ -167,6 +160,7 @@ void ED_armature_exit_posemode(bContext *C, Base *base)
 
 /* if a selected or active bone is protected, throw error (oonly if warn==1) and return 1 */
 /* only_selected==1 : the active bone is allowed to be protected */
+#if 0 /* UNUSED 2.5 */
 static short pose_has_protected_selected(Object *ob, short warn)
 {
 	/* check protection */
@@ -189,6 +183,7 @@ static short pose_has_protected_selected(Object *ob, short warn)
 	}
 	return 0;
 }
+#endif
 
 /* only for real IK, not for auto-IK */
 static int pose_channel_in_IK_chain(Object *ob, bPoseChannel *pchan, int level)
@@ -662,7 +657,7 @@ void POSE_OT_select_grouped (wmOperatorType *ot)
 }
 
 /* ********************************************** */
-
+#if 0 /* UNUSED 2.5 */
 static void pose_copy_menu(Scene *scene)
 {
 	Object *obedit= scene->obedit; // XXX context
@@ -860,6 +855,7 @@ static void pose_copy_menu(Scene *scene)
 	BIF_undo_push("Copy Pose Attributes");
 	
 }
+#endif
 
 /* ******************** copy/paste pose ********************** */
 
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c
index 5acdd013fb9..0e0be99a88a 100644
--- a/source/blender/editors/armature/reeb.c
+++ b/source/blender/editors/armature/reeb.c
@@ -59,9 +59,10 @@
 
 #include "reeb.h"
 
-
+#if 0 /* UNUSED 2.5 */
 static ReebGraph *GLOBAL_RG = NULL;
 static ReebGraph *FILTERED_RG = NULL;
+#endif
 
 /*
  * Skeleton generation algorithm based on: 
@@ -496,7 +497,7 @@ void repositionNodes(ReebGraph *rg)
 	}
 }
 
-static void verifyNodeDegree(ReebGraph *rg)
+void verifyNodeDegree(ReebGraph *rg)
 {
 #ifdef DEBUG_REEB
 	ReebNode *node = NULL;
@@ -578,7 +579,7 @@ void verifyFaces(ReebGraph *rg)
 #endif
 }
 
-static void verifyArcs(ReebGraph *rg)
+void verifyArcs(ReebGraph *rg)
 {
 	ReebArc *arc;
 	
@@ -625,6 +626,7 @@ static void addVertToBucket(EmbedBucket *b, float co[3])
 	interp_v3_v3v3(b->p, b->p, co, 1.0f / b->nv);
 }
 
+#if 0 /* UNUSED 2.5 */
 static void removeVertFromBucket(EmbedBucket *b, float co[3])
 {
 	mul_v3_fl(b->p, (float)b->nv);
@@ -632,6 +634,7 @@ static void removeVertFromBucket(EmbedBucket *b, float co[3])
 	b->nv--;
 	mul_v3_fl(b->p, 1.0f / (float)b->nv);
 }
+#endif
 
 static void mergeBuckets(EmbedBucket *bDst, EmbedBucket *bSrc)
 {
diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h
index 39f83407d74..cee42313db6 100644
--- a/source/blender/editors/armature/reeb.h
+++ b/source/blender/editors/armature/reeb.h
@@ -172,6 +172,8 @@ void sortArcs(ReebGraph *rg);
 /*------------ Sanity check ------------*/
 void verifyBuckets(ReebGraph *rg);
 void verifyFaces(ReebGraph *rg);
+void verifyArcs(ReebGraph *rg);
+void verifyNodeDegree(ReebGraph *rg);
 
 /*********************** PUBLIC *********************************/