RNA

* DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks!
  Some changes to make it more complete and adding inheritance to
  better hide irrelevant and reused properties.
* Also added all derived types for modifiers, but only fluid is
  filled in currently.
* Some files converted from DOS to UNIX line endings.

1 files changed, 441 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
new file mode 100644
index 00000000000..edb053c714f
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -0,0 +1,441 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Contributor(s): Blender Foundation (2008).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_object_fluidsim.h"
+
+#ifdef RNA_RUNTIME
+
+static StructRNA* rna_FluidSettings_refine(struct PointerRNA *ptr)
+{
+	FluidsimSettings *fss= (FluidsimSettings*)ptr->data;
+
+	switch(fss->type) {
+		case OB_FLUIDSIM_DOMAIN:
+			return &RNA_DomainFluidSettings;
+		case OB_FLUIDSIM_FLUID:
+			return &RNA_FluidFluidSettings;
+		case OB_FLUIDSIM_OBSTACLE:
+			return &RNA_ObstacleFluidSettings;
+		case OB_FLUIDSIM_INFLOW:
+			return &RNA_InflowFluidSettings;
+		case OB_FLUIDSIM_OUTFLOW:
+			return &RNA_OutflowFluidSettings;
+		case OB_FLUIDSIM_PARTICLE:
+			return &RNA_ParticleFluidSettings;
+		case OB_FLUIDSIM_CONTROL:
+			return &RNA_ControlFluidSettings;
+		default:
+			return &RNA_FluidSettings;
+	}
+}
+
+#else
+
+static void rna_def_fluidsim_slip(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	static EnumPropertyItem slip_items[] = {
+		{OB_FSBND_NOSLIP, "NOSLIP", "No Slip", "Obstacle causes zero normal and tangential velocity (=sticky). Default for all. Only option for moving objects."},
+		{OB_FSBND_PARTSLIP, "PARTIALSLIP", "Partial Slip", "Mix between no-slip and free-slip. Non moving objects only!"},
+		{OB_FSBND_FREESLIP, "FREESLIP", "Free Slip", "Obstacle only causes zero normal velocity (=not sticky). Non moving objects only!"},
+		{0, NULL, NULL, NULL}};
+
+	prop= RNA_def_property(srna, "slip_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "typeFlags");
+	RNA_def_property_enum_items(prop, slip_items);
+	RNA_def_property_ui_text(prop, "Slip Type", "");
+
+	prop= RNA_def_property(srna, "partial_slip_amount", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "partSlipValue");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Partial Slip Amount", "Amount of mixing between no- and free-slip, 0 is no slip and 1 is free slip.");
+}
+
+static void rna_def_fluidsim_domain(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem quality_items[] = {
+		{OB_FSDOM_GEOM, "GEOMETRY", "Geometry", "Display geometry."},
+		{OB_FSDOM_PREVIEW, "PREVIEW", "Preview", "Display preview quality results."},
+		{OB_FSDOM_FINAL, "FINAL", "Final", "Display final quality results."},
+		{0, NULL, NULL, NULL}};
+
+	static EnumPropertyItem viscosity_items[] = {
+		{1, "MANUAL", "Manual", "Manual viscosity settings."},
+		{2, "WATER", "Water", "Viscosity of 1.0 * 10^-6."},
+		{3, "OIL", "Oil", "Viscosity of 5.0 * 10^-5."},
+		{4, "HONEY", "Honey", "Viscosity of 2.0 * 10^-3."},
+		{0, NULL, NULL, NULL}};
+
+	srna= RNA_def_struct(brna, "DomainFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Domain Fluid Simulation Settings", "");
+
+	/* standard settings */
+
+	prop= RNA_def_property(srna, "resolution", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "resolutionxyz");
+	RNA_def_property_range(prop, 1, 1024);
+	RNA_def_property_ui_text(prop, "Resolution", "Domain resolution in X,Y and Z direction.");
+
+	prop= RNA_def_property(srna, "preview_resolution", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "previewresxyz");
+	RNA_def_property_range(prop, 1, 100);
+	RNA_def_property_ui_text(prop, "Preview Resolution", "Preview resolution in X,Y and Z direction.");
+
+	prop= RNA_def_property(srna, "start_time", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "animStart");
+	RNA_def_property_range(prop, 0, 100);
+	RNA_def_property_ui_text(prop, "Start Time", "Simulation time of the first blender frame.");
+
+	prop= RNA_def_property(srna, "end_time", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "animEnd");
+	RNA_def_property_range(prop, 0, 100);
+	RNA_def_property_ui_text(prop, "End Time", "Simulation time of the last blender frame.");
+
+	prop= RNA_def_property(srna, "viewport_display_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "guiDisplayMode");
+	RNA_def_property_enum_items(prop, quality_items);
+	RNA_def_property_ui_text(prop, "Viewport Display Mode", "How to display the mesh in the viewport.");
+
+	prop= RNA_def_property(srna, "render_display_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "renderDisplayMode");
+	RNA_def_property_enum_items(prop, quality_items);
+	RNA_def_property_ui_text(prop, "Render Display Mode", "How to display the mesh for rendering.");
+
+	prop= RNA_def_property(srna, "reverse_frames", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_FLUIDSIM_REVERSE);
+	RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse fluid frames.");
+
+	prop= RNA_def_property(srna, "path", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_maxlength(prop, 240);
+	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
+	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store baked fluid simulation files in.");
+
+	/* advanced settings */
+
+	prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_float_sdna(prop, NULL, "gravx");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_range(prop, -1000.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Gravity", "Gravity in X, Y and Z direction.");
+
+	prop= RNA_def_property(srna, "viscosity_preset", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "viscosityMode");
+	RNA_def_property_enum_items(prop, viscosity_items);
+	RNA_def_property_ui_text(prop, "Viscosity Preset", "Set viscosity of the fluid to a preset value, or use manual input.");
+
+	prop= RNA_def_property(srna, "viscosity_base", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "viscosityValue");
+	RNA_def_property_range(prop, 0, 10);
+	RNA_def_property_ui_text(prop, "Viscosity Base", "Viscosity setting: value that is multiplied by 10 to the power of (exponent*-1).");
+
+	prop= RNA_def_property(srna, "viscosity_exponent", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "viscosityExponent");
+	RNA_def_property_range(prop, 0, 10);
+	RNA_def_property_ui_text(prop, "Viscosity Exponent", "Negative exponent for the viscosity value (to simplify entering small values e.g. 5*10^-6.).");
+
+	prop= RNA_def_property(srna, "real_world_size", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "realsize");
+	RNA_def_property_range(prop, 0.001, 10);
+	RNA_def_property_ui_text(prop, "Real World Size", "Size of the simulation domain in metres.");
+
+	prop= RNA_def_property(srna, "grid_levels", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "maxRefine");
+	RNA_def_property_range(prop, -1, 4);
+	RNA_def_property_ui_text(prop, "Grid Levels", "Number of coursened grids to use (-1 for automatic).");
+
+	prop= RNA_def_property(srna, "compressibility", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "gstar");
+	RNA_def_property_range(prop, 0.001, 0.1);
+	RNA_def_property_ui_text(prop, "Compressibility", "Allowed compressibility due to gravitational force for standing fluid (directly affects simulation step size).");
+
+	/* domain boundary settings */
+
+	rna_def_fluidsim_slip(srna);
+
+	prop= RNA_def_property(srna, "surface_smoothing", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "surfaceSmoothing");
+	RNA_def_property_range(prop, 0.0, 5.0);
+	RNA_def_property_ui_text(prop, "Surface Smoothing", "Amount of surface smoothing. A value of 0 is off, 1 is normal smoothing and more than 1 is extra smoothing.");
+
+	prop= RNA_def_property(srna, "surface_subdivisions", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "surfaceSubdivs");
+	RNA_def_property_range(prop, 0, 5);
+	RNA_def_property_ui_text(prop, "Surface Subdivisions", "Number of isosurface subdivisions. This is necessary for the inclusion of particles into the surface generation. Warning - can lead to longer computation times!");
+
+	prop= RNA_def_property(srna, "generate_speed_vectors", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "domainNovecgen", 0);
+	RNA_def_property_ui_text(prop, "Generate Speed Vectors", "Generate speed vectors for vector blur.");
+
+	/* particles */
+
+	prop= RNA_def_property(srna, "tracer_particles", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "generateTracers");
+	RNA_def_property_range(prop, 0, 10000);
+	RNA_def_property_ui_text(prop, "Tracer Particles", "Number of tracer particles to generate");
+
+	prop= RNA_def_property(srna, "generate_particles", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "generateParticles");
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_text(prop, "Generate Particles", "Amount of particles to generate (0=off, 1=normal, >1=more).");
+}
+
+static void rna_def_fluidsim_volume(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	static EnumPropertyItem volume_type_items[] = {
+		{1, "VOLUME", "Volume", "Use only the inner volume of the mesh."},
+		{2, "SHELL", "Shell", "Use only the outer shell of the mesh."},
+		{3, "BOTH", "Both", "Use both the inner volume and the outer shell of the mesh."},
+		{0, NULL, NULL, NULL}};
+
+	prop= RNA_def_property(srna, "volume_initialization", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "volumeInitType");
+	RNA_def_property_enum_items(prop, volume_type_items);
+	RNA_def_property_ui_text(prop, "Volume Initialization", "Volume initialization type.");
+
+	prop= RNA_def_property(srna, "export_animated_mesh", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "domainNovecgen", 0);
+	RNA_def_property_ui_text(prop, "Export Animated Mesh", "Export this mesh as an animated one. Slower, only use if really necessary (e.g. armatures or parented objects), animated pos/rot/scale IPOs do not require it.");
+}
+
+static void rna_def_fluidsim_fluid(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "FluidFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Fluid Fluid Simulation Settings", "");
+
+	rna_def_fluidsim_volume(srna);
+
+	prop= RNA_def_property(srna, "initial_velocity", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_float_sdna(prop, NULL, "iniVelx");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_range(prop, -1000.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Initial Velocity", "Initial velocity of fluid.");
+}
+
+static void rna_def_fluidsim_obstacle(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+   	srna= RNA_def_struct(brna, "ObstacleFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Obstacle Fluid Simulation Settings", "");
+
+	rna_def_fluidsim_volume(srna);
+	rna_def_fluidsim_slip(srna);
+
+	prop= RNA_def_property(srna, "impact_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "surfaceSmoothing");
+	RNA_def_property_range(prop, -2.0, 10.0);
+	RNA_def_property_ui_text(prop, "Impact Factor", "This is an unphysical value for moving objects - it controls the impact an obstacle has on the fluid, =0 behaves a bit like outflow (deleting fluid), =1 is default, while >1 results in high forces. Can be used to tweak total mass.");
+}
+
+static void rna_def_fluidsim_inflow(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+   	srna= RNA_def_struct(brna, "InflowFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Inflow Fluid Simulation Settings", "");
+
+	rna_def_fluidsim_volume(srna);
+
+	prop= RNA_def_property(srna, "inflow_velocity", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_float_sdna(prop, NULL, "iniVelx");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_range(prop, -1000.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Inflow Velocity", "Initial velocity of fluid.");
+
+	prop= RNA_def_property(srna, "local_coordinates", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSINFLOW_LOCALCOORD);
+	RNA_def_property_ui_text(prop, "Local Coordinates", "Use local coordinates for inflow (e.g. for rotating objects).");
+}
+
+static void rna_def_fluidsim_outflow(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+   	srna= RNA_def_struct(brna, "OutflowFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Outflow Fluid Simulation Settings", "");
+
+	rna_def_fluidsim_volume(srna);
+}
+
+static void rna_def_fluidsim_particle(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+   	srna= RNA_def_struct(brna, "ParticleFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Particle Fluid Simulation Settings", "");
+
+	prop= RNA_def_property(srna, "drops", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSPART_DROP);
+	RNA_def_property_ui_text(prop, "Drops", "Show drop particles.");
+
+	prop= RNA_def_property(srna, "floats", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSPART_FLOAT);
+	RNA_def_property_ui_text(prop, "Floats", "Show floating foam particles.");
+
+	prop= RNA_def_property(srna, "tracer", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSPART_TRACER);
+	RNA_def_property_ui_text(prop, "Tracer", "Show tracer particles.");
+
+	prop= RNA_def_property(srna, "particle_influence", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "particleInfSize");
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_text(prop, "Particle Influence", "Amount of particle size scaling: 0=off (all same size), 1=full (range 0.2-2.0), >1=stronger.");
+
+	prop= RNA_def_property(srna, "alpha_influence", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "particleInfAlpha");
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_text(prop, "Alpha Influence", "Amount of particle alpha change, inverse of size influence: 0=off (all same alpha), 1=full (large particles get lower alphas, smaller ones higher values).");
+
+	prop= RNA_def_property(srna, "path", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_maxlength(prop, 240);
+	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
+	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store and load particles from.");
+}
+
+static void rna_def_fluidsim_control(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+   	srna= RNA_def_struct(brna, "ControlFluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_ui_text(srna, "Control Fluid Simulation Settings", "");
+
+	prop= RNA_def_property(srna, "start_time", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "cpsTimeStart");
+	RNA_def_property_range(prop, 0.0, 100.0);
+	RNA_def_property_ui_text(prop, "Start Time", "Specifies time when the control particles are activated.");
+	
+	prop= RNA_def_property(srna, "end_time", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "cpsTimeEnd");
+	RNA_def_property_range(prop, 0.0, 100.0);
+	RNA_def_property_ui_text(prop, "End Time", "Specifies time when the control particles are deactivated.");
+
+	prop= RNA_def_property(srna, "attraction_strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "attractforceStrength");
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_text(prop, "Attraction Strength", "Force strength for directional attraction towards the control object.");
+
+	prop= RNA_def_property(srna, "attraction_radius", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "attractforceRadius");
+	RNA_def_property_range(prop, 0.0, 5.0);
+	RNA_def_property_ui_text(prop, "Attraction Radius", "Specifies the force field radius around the control object.");
+	
+	prop= RNA_def_property(srna, "velocity_strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "velocityforceStrength");
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_text(prop, "Velocity Strength", "Force strength of how much of the control object's velocity is influencing the fluid velocity.");
+
+	prop= RNA_def_property(srna, "velocity_radius", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "velocityforceRadius");
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_text(prop, "Velocity Radius", "Specifies the force field radius around the control object.");
+
+	prop= RNA_def_property(srna, "quality", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "cpsQuality");
+	RNA_def_property_range(prop, 5.0, 100.0);
+	RNA_def_property_ui_text(prop, "Quality", "Specifies the quality which is used for object sampling (higher = better but slower).");
+
+	prop= RNA_def_property(srna, "reverse_frames", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_FLUIDSIM_REVERSE);
+	RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse control object movement.");
+}
+
+void RNA_def_fluidsim(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem prop_fluid_type_items[] = {
+		{0, "NONE", "None", ""},
+		{OB_FLUIDSIM_DOMAIN, "DOMAIN", "Domain", "Bounding box of this object represents the computational domain of the fluid simulation."},
+		{OB_FLUIDSIM_FLUID, "FLUID", "Fluid", "Object represents a volume of fluid in the simulation."},
+		{OB_FLUIDSIM_OBSTACLE, "OBSTACLE", "Obstacle", "Object is a fixed obstacle."},
+		{OB_FLUIDSIM_INFLOW, "INFLOW", "Inflow", "Object adds fluid to the simulation."},
+		{OB_FLUIDSIM_OUTFLOW, "OUTFLOW", "Outflow", "Object removes fluid from the simulation."},
+		{OB_FLUIDSIM_PARTICLE, "PARTICLE", "Particle", "Object is made a particle system to display particles generated by a fluidsim domain object."},
+		{OB_FLUIDSIM_CONTROL, "CONTROL", "Control", "Object is made a fluid control mesh, which influences the fluid."},
+		{0, NULL, NULL, NULL}};
+
+
+	srna= RNA_def_struct(brna, "FluidSettings", NULL);
+	RNA_def_struct_sdna(srna, "FluidsimSettings");
+	RNA_def_struct_funcs(srna, NULL, "rna_FluidSettings_refine");
+	RNA_def_struct_ui_text(srna, "Fluid Simulation Settings", "");
+
+	/* enable and type */
+
+	prop= RNA_def_property(srna, "enable", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "type", OB_FLUIDSIM_ENABLE);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); // needs to create modifier
+	RNA_def_property_ui_text(prop, "Enable", "Sets object to participate in fluid simulation.");
+
+	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, prop_fluid_type_items);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); // needs to update variables
+	RNA_def_property_ui_text(prop, "Type", "Type of participation in the fluid simulation.");
+
+	prop= RNA_def_property(srna, "ipo", PROP_POINTER, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Ipo Curves", "Ipo curves used by fluid simulation settings.");
+
+	/* types */
+
+	rna_def_fluidsim_domain(brna);
+	rna_def_fluidsim_fluid(brna);
+	rna_def_fluidsim_obstacle(brna);
+	rna_def_fluidsim_inflow(brna);
+	rna_def_fluidsim_outflow(brna);
+	rna_def_fluidsim_particle(brna);
+	rna_def_fluidsim_control(brna);
+}
+
+
+#endif