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!

6 files changed, 20 insertions, 12 deletions

diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 845ff9bbb77..98745e9a0f2 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/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 {
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index d468daef52a..a7427b1b306 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/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;
 
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 4567717ea7a..57dca4ddcb5 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/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;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 9ebf6a5bec3..28cf5e84d89 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/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;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 6b8f7bfecc7..cac95a85d54 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/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;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 2dea71856e9..0973ed90c8b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/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);