Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / physics / ed_fluidsim.c
index 093fa3f..907d3f9 100644 (file)
@@ -200,28 +200,6 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char
 static void fluidsimInitChannel(Scene *scene, float **setchannel, int size, float *time, 
                int *icuIds, float *defaults, Ipo* ipo, int entries) 
 {
 static void fluidsimInitChannel(Scene *scene, float **setchannel, int size, float *time, 
                int *icuIds, float *defaults, Ipo* ipo, int entries) 
 {
-
-       int i, j;
-       char *cstr = NULL;
-       float *channel = NULL;
-       
-       cstr = "fluidsiminit_channelfloat";
-       if(entries>1) cstr = "fluidsiminit_channelvec";
-       channel = MEM_callocN( size* (entries+1)* sizeof(float), cstr );
-       
-       /* defaults  for now */
-       for(j=0; j<entries; j++) {
-               for(i=1; i<=size; i++) {
-                       channel[(i-1)*(entries+1) + j] = defaults[j];
-               }       
-       }
-       
-       for(i=1; i<=size; i++) {
-               channel[(i-1)*(entries+1) + entries] = time[i];
-       }
-
-       *setchannel = channel;
-
 #if 0
        /* goes away completely */
        int i,j;
 #if 0
        /* goes away completely */
        int i,j;