[Bf-blender-cvs] [e7e5ef2] soc-2014-fluid: use_manta property added to smoke DNA

Roman Pogribnyi noreply at git.blender.org
Fri May 30 14:15:59 CEST 2014


Commit: e7e5ef2c040162e4013a0bcd2bea1a097fc40544
Author: Roman Pogribnyi
Date:   Fri May 30 13:45:43 2014 +0200
https://developer.blender.org/rBe7e5ef2c040162e4013a0bcd2bea1a097fc40544

use_manta property added to smoke DNA

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

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 25c98b4..b80eb23 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -37,6 +37,7 @@ enum {
 	MOD_SMOKE_HIGHRES = (1 << 1),  /* enable high resolution */
 	MOD_SMOKE_DISSOLVE = (1 << 2),  /* let smoke dissolve */
 	MOD_SMOKE_DISSOLVE_LOG = (1 << 3),  /* using 1/x for dissolve */
+	MOD_SMOKE_USE_MANTA = (1 << 4),
 
 	MOD_SMOKE_HIGH_SMOOTH = (1 << 5),  /* -- Deprecated -- */
 	MOD_SMOKE_FILE_LOAD = (1 << 6),  /* flag for file load */
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 6e0d374..a9e49fc 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -317,6 +317,10 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 
+	prop = RNA_def_property(srna, "use_manta", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_USE_MANTA);
+	RNA_def_property_ui_text(prop, "MantaFlow", "Use Mantaflow");
+
 	prop = RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "amplify");
 	RNA_def_property_range(prop, 1, 10);




More information about the Bf-blender-cvs mailing list