[Bf-blender-cvs] [d3c57bc] fluid-mantaflow: added some liquid domain flags. mantaflow needs to know what domain to setup

[Sebastián Barschkis]

Commit: d3c57bc244c082328ea048dc862eb286f2aa04b0
Author: Sebastián Barschkis
Date:   Sat Jun 4 22:04:09 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd3c57bc244c082328ea048dc862eb286f2aa04b0

added some liquid domain flags. mantaflow needs to know what domain to setup

===================================================================

M	source/blender/makesdna/DNA_smoke_types.h
M	source/blender/makesrna/intern/rna_smoke.c

===================================================================

diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index ec0a8bc..bf321e1 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -32,6 +32,10 @@
 #ifndef __DNA_SMOKE_TYPES_H__
 #define __DNA_SMOKE_TYPES_H__
 
+/* type */
+#define MOD_SMOKE_DOMAIN_TYPE_GAS 0
+#define MOD_SMOKE_DOMAIN_TYPE_LIQUID 1
+
 /* flags */
 enum {
 	MOD_SMOKE_HIGHRES = (1 << 1),  /* enable high resolution */
@@ -173,7 +177,8 @@ typedef struct SmokeDomainSettings {
 	float noise_time_anim;
 	int manta_solver_res;	/* dimension of manta solver, 2d or 3d */
 	char manta_filepath[1024];
-	float mock_var; /* unused */
+	short type; /* gas, liquid */
+	short mock_var; /* unused */
 } SmokeDomainSettings;
 
 /* type */
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index aa3e712..c25e8d3 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -406,6 +406,12 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
+	
+	static EnumPropertyItem smoke_domain_types[] = {
+		{MOD_SMOKE_DOMAIN_TYPE_GAS, "GAS", 0, "Gas", "Create domain for gases"},
+		{MOD_SMOKE_DOMAIN_TYPE_LIQUID, "LIQUID", 0, "Liquid", "Create domain for liquids"},
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem prop_noise_type_items[] = {
 		{MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""},
@@ -464,6 +470,12 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Domain Settings", "Smoke domain settings");
 	RNA_def_struct_sdna(srna, "SmokeDomainSettings");
 	RNA_def_struct_path_func(srna, "rna_SmokeDomainSettings_path");
+	
+	prop = RNA_def_property(srna, "smoke_domain_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, smoke_domain_types);
+	RNA_def_property_ui_text(prop, "Domain Type", "Change domain type of the simulation");
+	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 
 	prop = RNA_def_property(srna, "resolution_max", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "maxres");