2.5

Cleanup warnings from Joshua's commit (mostly unused variables,
but also used functions that were not prototyped).

Two bugfixes; passing on &ob->adt instead of ob->adt

But; the DNA system is now messed up, with two structs using
the same ID (nAction and bAction), that goes horrible wrong!

source/blender/blenkernel/BKE_ipo.h

@@ -35,6 +35,12 @@
 extern "C" {
 #endif
 
+	
+/* -------- IPO-Curve (Bezier) Calculations ---------- */
+
+void correct_bezpart(float *v1, float *v2, float *v3, float *v4);
+	
+	
 #if 0 // XXX old animation system
 
 typedef struct CfraElem {

source/blender/blenkernel/intern/action.c

@@ -95,7 +95,7 @@ nAction *add_empty_action(const char name[])
 // does copy_fcurve...
 void make_local_action(nAction *act)
 {
-	Object *ob;
+	// Object *ob;
 	nAction *actn;
 	int local=0, lib=0;
 	
@@ -149,15 +149,15 @@ void make_local_action(nAction *act)
 
 void free_action (nAction *act)
 {
-	FCurve *fcu, *fcn;
+	FCurve *fcu;
 	
 	/* sanity check */
 	if (act == NULL)
 		return;
 	
 	/* Free F-Curves */
-	for (fcu= act->curves.first; fcu; fcu= fcn) {
-		fcn= fcu->next;
+	while ((fcu= act->curves.first)) {
+		BLI_remlink(&act->curves, fcu);
 		free_fcurve(fcu);
 	}
 	
@@ -174,7 +174,7 @@ nAction *copy_action (nAction *src)
 {
 	nAction *dst = NULL;
 	//bActionChannel *dchan, *schan;
-	bActionGroup *dgrp, *sgrp;
+	// bActionGroup *dgrp, *sgrp;
 	
 	if (!src) return NULL;
 	
@@ -573,7 +573,7 @@ float get_action_frame_inv(Object *ob, float cframe)
 /* Calculate the extents of given action */
 void calc_action_range(const bAction *act, float *start, float *end, int incl_hidden)
 {
-	FCurve *fcu;
+	// FCurve *fcu;
 	float min=999999999.0f, max=-999999999.0f;
 	int	foundvert=0;
 

source/blender/blenkernel/intern/depsgraph.c

@@ -1953,9 +1953,9 @@ static int object_modifiers_use_time(Object *ob)
 	return 0;
 }
 
+#if 0 // XXX old animation system
 static int exists_channel(Object *ob, char *name)
 {
-#if 0 // XXX old animation system
 	bActionStrip *strip;
 	
 	if(ob->action)
@@ -1965,16 +1965,18 @@ static int exists_channel(Object *ob, char *name)
 	for (strip=ob->nlastrips.first; strip; strip=strip->next)
 		if(get_action_channel(strip->act, name))
 			return 1;
-#endif // XXX old animation system
 
 	return 0;
 }
+#endif // XXX old animation system
 
 
 static short animdata_use_time(AnimData *adt)
 {
 	NlaTrack *nlt;
 	
+	if(adt==NULL) return 0;
+	
 	/* check action - only if assigned, and it has anim curves */
 	if (adt->action && adt->action->curves.first)
 		return 1;
@@ -2038,7 +2040,7 @@ static void dag_object_time_update_flags(Object *ob)
 		}
 	}
 #endif // XXX old animation system
-	if(animdata_use_time(&ob->adt)) ob->recalc |= OB_RECALC;
+	if(animdata_use_time(ob->adt)) ob->recalc |= OB_RECALC;
 	
 	if(object_modifiers_use_time(ob)) ob->recalc |= OB_RECALC_DATA;
 	if((ob->pose) && (ob->pose->flag & POSE_CONSTRAINTS_TIMEDEPEND)) ob->recalc |= OB_RECALC_DATA;

source/blender/blenkernel/intern/object.c

@@ -1867,7 +1867,7 @@ void where_is_object_time(Scene *scene, Object *ob, float ctime)
 #endif // XXX old animation system
 
 	/* execute drivers only, as animation has already been done */
-	BKE_animsys_evaluate_animdata(&ob->id, &ob->adt, ctime, ADT_RECALC_DRIVERS);
+	BKE_animsys_evaluate_animdata(&ob->id, ob->adt, ctime, ADT_RECALC_DRIVERS);
 	
 	if(ob->parent) {
 		Object *par= ob->parent;

source/blender/blenkernel/intern/particle.c

@@ -3300,7 +3300,7 @@ float psys_get_child_time(ParticleSystem *psys, ChildParticle *cpa, float cfra)
 float psys_get_child_size(ParticleSystem *psys, ChildParticle *cpa, float cfra, float *pa_time)
 {
 	ParticleSettings *part = psys->part;
-	float size, time;
+	float size; // time XXX
 	
 	if(part->childtype==PART_CHILD_FACES){
 		size=part->size;

source/blender/blenkernel/intern/particle_system.c

@@ -4215,7 +4215,7 @@ static void cached_step(Scene *scene, Object *ob, ParticleSystemModifierData *ps
 	IpoCurve *icu_esize= NULL; //=find_ipocurve(part->ipo,PART_EMIT_SIZE); // XXX old animation system
 	Material *ma=give_current_material(ob,part->omat);
 	int p;
-	float ipotime=cfra, disp, birthtime, dietime, *vg_size= NULL;
+	float disp, birthtime, dietime, *vg_size= NULL; // XXX ipotime=cfra
 
 	if(part->from!=PART_FROM_PARTICLE)
 		vg_size= psys_cache_vgroup(psmd->dm,psys,PSYS_VG_SIZE);

source/blender/blenlib/BLI_dynamiclist.h

@@ -50,15 +50,16 @@ typedef struct DynamicList {
 	struct ListBase lb;		/* two way linked dynamic list */
 } DynamicList;
 
-struct DynamicList *BLI_dlist_from_listbase(struct ListBase *lb);
-struct ListBase *BLI_listbase_from_dlist(struct DynamicList *dlist, struct ListBase *lb);
-void * BLI_dlist_find_link(struct DynamicList *dlist, unsigned int index);
-unsigned int BLI_count_items(struct DynamicList *dlist);
-void BLI_dlist_free_item(struct DynamicList *dlist, unsigned int index);
-void BLI_dlist_rem_item(struct DynamicList *dlist, unsigned int index);
-void * BLI_dlist_add_item_index(struct DynamicList *dlist, void *item, unsigned int index);
-void BLI_dlist_destroy(struct DynamicList *dlist);
-void BLI_dlist_init(struct DynamicList *dlist);
-void BLI_dlist_reinit(struct DynamicList *dlist);
+/* note: 'index' is a string.h function, do not use in includes */
+struct DynamicList *BLI_dlist_from_listbase(struct ListBase *);
+struct ListBase *BLI_listbase_from_dlist(struct DynamicList *, struct ListBase *);
+void * BLI_dlist_find_link(struct DynamicList *, unsigned int);
+unsigned int BLI_count_items(struct DynamicList *);
+void BLI_dlist_free_item(struct DynamicList *, unsigned int);
+void BLI_dlist_rem_item(struct DynamicList *, unsigned int);
+void * BLI_dlist_add_item_index(struct DynamicList *, void *, unsigned int);
+void BLI_dlist_destroy(struct DynamicList *);
+void BLI_dlist_init(struct DynamicList *);
+void BLI_dlist_reinit(struct DynamicList *);
 
 #endif

source/blender/blenlib/intern/fileops.c

@@ -31,16 +31,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "zlib.h"
 
 #ifdef WIN32
 #include "BLI_winstuff.h"
 #include <io.h>
 #else
+#include <unistd.h> // for read close
 #include <sys/param.h>
 #endif
 

source/blender/editors/armature/poselib.c

@@ -193,7 +193,8 @@ bAction *poselib_init_new (Object *ob)
 	/* init object's poselib action (unlink old one if there) */
 	if (ob->poselib)
 		ob->poselib->id.us--;
-	ob->poselib= add_empty_action("PoseLib");
+	// XXX old anim stuff
+	// ob->poselib= add_empty_action("PoseLib");
 	
 	return ob->poselib;
 }
@@ -272,11 +273,11 @@ void poselib_validate_act (bAction *act)
 }
 
 /* ************************************************************* */
+#if 0 // XXX old animation system
 
 /* This function adds an ipo-curve of the right type where it's needed */
 static IpoCurve *poselib_verify_icu (Ipo *ipo, int adrcode)
 {
-#if 0 // XXX old animation system
 	IpoCurve *icu;
 	
 	for (icu= ipo->curve.first; icu; icu= icu->next) {
@@ -297,9 +298,8 @@ static IpoCurve *poselib_verify_icu (Ipo *ipo, int adrcode)
 	}
 	
 	return icu;
-#endif // XXX old animation system
-	return NULL;
 }
+#endif // XXX old animation system
 
 /* This tool adds the current pose to the poselib 
  *	Note: Standard insertkey cannot be used for this due to its limitations
@@ -311,8 +311,8 @@ void poselib_add_current_pose (Scene *scene, Object *ob, int val)
 	bPoseChannel *pchan;
 	TimeMarker *marker;
 	bAction *act;
-	bActionChannel *achan;
-	IpoCurve *icu;
+	// bActionChannel *achan;
+	// IpoCurve *icu;
 	int frame;
 	char name[64];
 	
@@ -430,7 +430,7 @@ void poselib_remove_pose (Object *ob, TimeMarker *marker)
 {
 	bPose *pose= (ob) ? ob->pose : NULL;
 	bAction *act= (ob) ? ob->poselib : NULL;
-	bActionChannel *achan;
+	// bActionChannel *achan;
 	char *menustr;
 	int val;
 	

source/blender/editors/armature/poseobject.c

@@ -86,7 +86,6 @@ static void BIF_undo_push() {}
 static void countall() {}
 static void add_constraint() {}
 static void select_actionchannel_by_name() {}
-static int autokeyframe_cfra_can_key() {return 0;}
 static void autokeyframe_pose_cb_func() {}
 /* ************* XXX *************** */
 
@@ -1423,7 +1422,8 @@ void pose_movetolayer(Scene *scene)
 	}
 }
 
-
+#if 0
+// XXX old sys
 /* for use with pose_relax only */
 static int pose_relax_icu(struct IpoCurve *icu, float framef, float *val, float *frame_prev, float *frame_next)
 {
@@ -1479,6 +1479,7 @@ static int pose_relax_icu(struct IpoCurve *icu, float framef, float *val, float
 		return 1;
 	}
 }
+#endif
 
 void pose_relax(Scene *scene)
 {
@@ -1487,19 +1488,19 @@ void pose_relax(Scene *scene)
 	bAction *act;
 	bArmature *arm;
 	
-	IpoCurve *icu_w, *icu_x, *icu_y, *icu_z;
+//	IpoCurve *icu_w, *icu_x, *icu_y, *icu_z;
 	
 	bPoseChannel *pchan;
-	bActionChannel *achan;
-	float framef = F_CFRA;
-	float frame_prev, frame_next;
-	float quat_prev[4], quat_next[4], quat_interp[4], quat_orig[4];
+//	bActionChannel *achan;
+//	float framef = F_CFRA;
+//	float frame_prev, frame_next;
+//	float quat_prev[4], quat_next[4], quat_interp[4], quat_orig[4];
 	
 	int do_scale = 0;
 	int do_loc = 0;
 	int do_quat = 0;
 	int flag = 0;
-	int do_x, do_y, do_z;
+//	int do_x, do_y, do_z;
 	
 	if (!ob) return;
 	

source/blender/editors/space_action/action_edit.c

@@ -255,10 +255,10 @@ static float actcopy_firstframe= 999999999.0f;
 // XXX find some header to put this in!
 void free_actcopybuf ()
 {
+#if 0 // XXX old animation system
 	bActionChannel *achan, *anext;
 	bConstraintChannel *conchan, *cnext;
 	
-#if 0 // XXX old animation system
 	for (achan= actcopybuf.first; achan; achan= anext) {
 		anext= achan->next;
 		

source/blender/editors/space_ipo/ipo_draw.c

@@ -481,7 +481,7 @@ static void draw_ipocurve_repeat_normal (IpoCurve *icu, View2D *v2d, float cycxo
 				v4[0]= bezt->vec[1][0]+cycxofs;
 				v4[1]= bezt->vec[1][1]+cycyofs;
 				
-				correct_bezpart(v1, v2, v3, v4);
+// XXX old sys!				correct_bezpart(v1, v2, v3, v4);
 				
 				forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3);
 				forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3);

source/blender/editors/space_view3d/drawarmature.c

@@ -2024,8 +2024,8 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, Object *ob)
 {
 	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
-	bAction *act; // XXX old animsys - watch it!
-	bActionChannel *achan;
+	// bAction *act; // XXX old animsys - watch it!
+	// bActionChannel *achan;
 	ActKeyColumn *ak;
 	ListBase keys;
 	float *fp, *fp_start;