diff options
| author | Roman Pogribnyi <pogribnyi@gmail.com> | 2014-06-07 01:39:00 +0400 |
|---|---|---|
| committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2014-06-07 01:39:00 +0400 |
| commit | 9ed7be50aaee593f55432d90c838f33128c41176 (patch) | |
| tree | f67fa99c883ab77624cda16262a123acea4af44d /source/blender | |
| parent | 1eae4069f7f38c6b919a318507c5dbf7cf327238 (diff) | |
Separate Solver creation function; 2D solver option implemented: UI + functionality
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_smoke.c | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index b80eb23ab8f..9384ed8182a 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -150,6 +150,9 @@ typedef struct SmokeDomainSettings { float burning_rate, flame_smoke, flame_vorticity; float flame_ignition, flame_max_temp; float flame_smoke_color[3]; + /* mantaflow settings */ + int manta_solver_res; /*dimension of manta solver, 2d or 3d*/ + int manta_mockvar; } SmokeDomainSettings; diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index a9e49fc11e9..137c1fc8b67 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -317,10 +317,6 @@ 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); @@ -548,6 +544,19 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Threshold", "Maximum amount of fluid cell can contain before it is considered empty"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache"); + + /* mantaflow variables */ + 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, "manta_solver_res", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "manta_solver_res"); + RNA_def_property_range(prop, 2, 3); + RNA_def_property_ui_range(prop, 2, 3, 1, -1); + RNA_def_property_ui_text(prop, "Solver Res", "Solver resolution(2D/3D)"); + RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset"); + } static void rna_def_smoke_flow_settings(BlenderRNA *brna) |