- 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, 9 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h
index 6a02680d694..1b5b77591f7 100644
--- a/source/blender/makesdna/DNA_object_fluidsim.h
+++ b/source/blender/makesdna/DNA_object_fluidsim.h
@@ -75,10 +75,18 @@ typedef struct FluidsimSettings {
 
 	/* store pointer to original mesh (for replacing the current one) */
 	struct Mesh *orgMesh;
+	/* pointer to the currently loaded fluidsim mesh */
+	struct Mesh *meshSurface;
+	/* a mesh to display the bounding box used for simulation */
+	struct Mesh *meshBB;
 
 	/* store output path, and file prefix for baked fluid surface */
 	/* strlens; 80= FILE_MAXFILE, 160= FILE_MAXDIR */
-	char surfdataPath[160+80];
+	char surfdataPath[240];
+
+	/* store start coords of axis aligned bounding box together with size */
+	/* values are inited during derived mesh display */
+	float bbStart[3], bbSize[3];
 } FluidsimSettings;
 
 /* ob->fluidsimSettings defines */