3 files changed, 14 insertions, 2 deletions

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4de6c770cdc..6afc0ac472f 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1520,10 +1520,12 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	if(part->bb_ob)
 		bb_ob=part->bb_ob;
 	
+#if 0 // XXX old animation system
 	if(ma->ipo){
 		calc_ipo(ma->ipo, cfra);
 		execute_ipo((ID *)ma, ma->ipo);
 	}
+#endif // XXX old animation system
 
 	RE_set_customdata_names(obr, &psmd->dm->faceData);
 	totuv=CustomData_number_of_layers(&psmd->dm->faceData,CD_MTFACE);
@@ -1563,10 +1565,12 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		}
 	}
 
+#if 0 // XXX old animation system
 	if(part->flag&PART_ABS_TIME && part->ipo){
 		calc_ipo(part->ipo, cfra);
 		execute_ipo((ID *)part, part->ipo);
 	}
+#endif // XXX old animation system
 
 	if(part->flag&PART_GLOB_TIME)
 		cfra=bsystem_time(re->scene, 0, (float)re->scene->r.cfra, 0.0);
@@ -1684,6 +1688,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 
 			pa_time=(cfra-pa->time)/pa->lifetime;
 			if((part->flag&PART_ABS_TIME)==0){
+#if 0 // XXX old animation system
 				if(ma->ipo){
 					/* correction for lifetime */
 					calc_ipo(ma->ipo, 100.0f*pa_time);
@@ -1694,6 +1699,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 					calc_ipo(part->ipo, 100.0f*pa_time);
 					execute_ipo((ID *)part, part->ipo);
 				}
+#endif // XXX old animation system
 			}
 
 			hasize = ma->hasize;
@@ -1758,6 +1764,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 			pa_time=psys_get_child_time(psys, cpa, cfra);
 
 			if((part->flag&PART_ABS_TIME)==0){
+#if 0 // XXX old animation system
 				if(ma->ipo){
 					/* correction for lifetime */
 					calc_ipo(ma->ipo, 100.0f*pa_time);
@@ -1768,6 +1775,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 					calc_ipo(part->ipo, 100.0f*pa_time);
 					execute_ipo((ID *)part, part->ipo);
 				}
+#endif // XXX old animation system
 			}
 
 			pa_size=psys_get_child_size(psys, cpa, cfra, &pa_time);
@@ -2021,8 +2029,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		strandbuf->surface= cache_strand_surface(re, obr, psmd->dm, mat, timeoffset);
 
 /* 4. clean up */
+#if 0 // XXX old animation system
 	if(ma) do_mat_ipo(re->scene, ma);
-
+#endif // XXX old animation system
+	
 	if(orco1)
 		MEM_freeN(orco);
 
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index eb1e80948f6..a0185a64659 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -458,10 +458,12 @@ void RE_SetCamera(Render *re, Object *camera)
 		 * Need to update the camera early because it's used for projection matrices
 		 * and other stuff BEFORE the animation update loop is done 
 		 * */
+#if 0 // XXX old animation system
 		if(cam->ipo) {
 			calc_ipo(cam->ipo, frame_to_float(re->scene, re->r.cfra));
 			execute_ipo(&cam->id, cam->ipo);
 		}
+#endif // XXX old animation system
 		lens= cam->lens;
 		shiftx=cam->shiftx;
 		shifty=cam->shifty;
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 19973e972d2..afe732d885b 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -93,7 +93,7 @@ void init_render_texture(Render *re, Tex *tex)
 	if(tex->type==TEX_PLUGIN) {
 		if(tex->plugin && tex->plugin->doit) {
 			if(tex->plugin->cfra) {
-				*(tex->plugin->cfra)= frame_to_float(re->scene, cfra); 
+				*(tex->plugin->cfra)= (float)cfra; //frame_to_float(re->scene, cfra); // XXX old animsys - timing stuff to be fixed 
 			}
 		}
 	}