Merging fluidcontrol to trunk from rev16649 fluidcontrol branch. Code provided by Nils Thuerey.

1 files changed, 8 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 9599cc1d247..114dfe10bae 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -36,6 +36,7 @@ typedef enum ModifierType {
 	eModifierType_Collision,
 	eModifierType_Bevel,
 	eModifierType_Shrinkwrap,
+	eModifierType_Fluidsim,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -492,6 +493,13 @@ typedef struct ExplodeModifierData {
 	float protect;
 } ExplodeModifierData;
 
+typedef struct FluidsimModifierData {
+	ModifierData modifier;
+	
+	struct FluidsimSettings *fss; /* definition is is DNA_object_fluidsim.h */
+	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
+} FluidsimModifierData;
+
 typedef struct ShrinkwrapModifierData {
 	ModifierData modifier;