sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- fixed output behaviour (now behaves just like render output,

Browse Source 
thus directories in the path are created using RE_make_existing_file
  in fluidsim.c)
- changed default output to be '//fluidsimdata/...'
- hopefully fixed bugs #3466 and #3470 (orco texture coords caused
  problems when the fluidsim mesh was bigger than the original one,
  one no other deformations were used - new deformedVerts are now
  allocated in this case in DerivedMesh.c)
This commit is contained in:
Nils Thuerey 2005-12-03 17:45:35 +00:00
parent 5b9e85f0a2
commit e49998807c
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -1511,7 +1511,14 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3], DerivedM
*/
if (deform_r) *deform_r = getMeshDerivedMesh(me, ob, deformedVerts);
} else {
deformedVerts = inputVertexCos;
if(!fluidsimMeshUsed) {
// default behaviour for meshes
deformedVerts = inputVertexCos;
} else {
// the fluid sim mesh might have more vertices than the original
// one, so inputVertexCos shouldnt be used
deformedVerts = mesh_getVertexCos(me, &numVerts);
}
}

13
source/blender/src/fluidsim.c
View File

@ -343,9 +343,13 @@ void fluidsimBake(struct Object *ob)
strcpy(targetFile, targetDir);
strcat(targetFile, suffixConfig);
// make sure all directories exist
// as the bobjs use the same dir, this only needs to be checked
// for the cfg output
RE_make_existing_file(targetFile);
// check selected directory
// simply try to open cfg file for writing to test validity of settings
ADD_CREATEDFILE(targetFile);
fileCfg = fopen(targetFile, "w");
if(fileCfg) { dirExist = 1; fclose(fileCfg); }
@ -362,7 +366,7 @@ void fluidsimBake(struct Object *ob)
}
}
// todo... strip .blend ?
snprintf(newSurfdataPath,FILE_MAXFILE+FILE_MAXDIR,"//%s_%s_", blendFile, fsDomain->id.name);
snprintf(newSurfdataPath,FILE_MAXFILE+FILE_MAXDIR,"//fluidsimdata/%s_%s_", blendFile, fsDomain->id.name);
snprintf(debugStrBuffer,256,"fluidsimBake::error - warning resetting output dir to '%s'\n", newSurfdataPath);
elbeemDebugOut(debugStrBuffer);
@ -391,6 +395,10 @@ void fluidsimBake(struct Object *ob)
// start writing
strcpy(targetFile, targetDir);
strcat(targetFile, suffixConfig);
// make sure these directories exist as well
if(outStringsChanged) {
RE_make_existing_file(targetFile);
}
fileCfg = fopen(targetFile, "w");
if(!fileCfg) {
snprintf(debugStrBuffer,256,"fluidsimBake::error - Unable to open file for writing '%s'\n", targetFile);
@ -399,6 +407,7 @@ void fluidsimBake(struct Object *ob)
pupmenu("Fluidsim Bake Error%t|Unable to output files... Aborted%x0");
return;
}
ADD_CREATEDFILE(targetFile);
fprintf(fileCfg, "# Blender ElBeem File , Source %s , Frame %d, to %s \n\n\n", G.sce, -1, targetFile );
// file open -> valid settings -> store