diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/editors/physics/physics_fluid.c | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/physics/physics_fluid.c')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 23765b03d35..6a074a542c3 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -224,17 +224,17 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char // invalid, cant happen? } - fprintf(file, " CHANNEL %s = \n", str); + fprintf(file, " CHANNEL %s =\n", str); for (i=0; i<channelSize;i++) { fprintf(file," "); for (j=0;j<=entries;j++) { // also print time value fprintf(file," %f ", channel[i*(entries+1)+j] ); if (j==entries-1) { fprintf(file," "); } } - fprintf(file," \n"); + fprintf(file,"\n"); } - fprintf(file, " ; \n" ); + fprintf(file, " ;\n" ); } #endif @@ -805,7 +805,7 @@ int runSimulationCallback(void *data, int status, int frame) if (status == FLUIDSIM_CBSTATUS_NEWFRAME) { fluidbake_updatejob(fb, frame / (float)settings->noOfFrames); - //printf("elbeem blender cb s%d, f%d, domainid:%d noOfFrames: %d \n", status,frame, settings->domainId, settings->noOfFrames ); // DEBUG + //printf("elbeem blender cb s%d, f%d, domainid:%d noOfFrames: %d\n", status,frame, settings->domainId, settings->noOfFrames ); // DEBUG } if (fluidbake_breakjob(fb)) { |