Revision: 23075 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23075 Author: broken Date: 2009-09-09 09:52:44 +0200 (Wed, 09 Sep 2009)
Log Message: ----------- * Temporary fix to get fluid sim (and fluid control) working properly (without animated parameters). This just fills the fluid sim animation channels with default values for now, but will need to be updated to new animation system. Modified Paths: -------------- branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c Modified: branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c 2009-09-09 07:05:04 UTC (rev 23074) +++ branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c 2009-09-09 07:52:44 UTC (rev 23075) @@ -200,6 +200,28 @@ 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; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs