- changed DerivedMesh integration, the fluidsim meshes now

  replace the original one. so modifiers now work with them
  (apply modifier, or edit mode still work on original mesh).
  this should fix the three fluidsim bugs in the tracker.
- fixed stupid makesdna problem (writing "char string[160+80]" isnt
  a good idea :)
- changed GUI a bit, now displays an estimate of the required memory,
  there's still a problem with redrawing (currently relies on a call
  to the derived mesh generation)
- the fluidsim struct changed to store the bounding box,
  and the current loaded surface mesh
- temporary simulation files are now removed if env. var.
  BLENDER_DELETEELBEEMFILES is not set or zero
- fluidsimSettingsFree now gets properly called when freeing an object

1 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index fea9ac87480..9490a4ca5ce 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2402,8 +2402,10 @@ static void direct_link_object(FileData *fd, Object *ob)
 	}
 	ob->fluidsimSettings= newdataadr(fd, ob->fluidsimSettings); /* NT */
 	if(ob->fluidsimSettings) {
-		// not much to do for now... 
-		ob->fluidsimSettings->orgMesh = NULL;
+		// reinit mesh pointers
+		ob->fluidsimSettings->orgMesh = NULL; //ob->data;
+		ob->fluidsimSettings->meshSurface = NULL;
+		ob->fluidsimSettings->meshBB = NULL;
 	}
 	
 	link_list(fd, &ob->prop);