diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-24 01:50:25 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-24 01:50:39 +0300 |
| commit | cda81d5a4d391a8a7b298eb1b6f2fdf1a0ed838a (patch) | |
| tree | a6234c07dbc940af17166111d201e08f890a8cc8 /source/blender/makesrna/intern/rna_fluid.c | |
| parent | e9629e3cfdaf995bd76249595c5c2b7d81432e76 (diff) | |
Fluid: Enforce minimum thickness to planar flow / effector objects
Planar object now have a thickness by default. This should make it more intuitive for users as there is no need to specify an object thickness.
Diffstat (limited to 'source/blender/makesrna/intern/rna_fluid.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_fluid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index 9b46d0cd4a7..9410906595d 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -1332,6 +1332,11 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Fluid_flip_parts_update"); + prop = RNA_def_property(srna, "delete_in_obstacle", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flags", FLUID_DOMAIN_DELETE_IN_OBSTACLE); + RNA_def_property_ui_text(prop, "Clear In Obstacle", "Delete fluid inside obstacles"); + RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); + /* smoke domain options */ prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE); @@ -2541,7 +2546,7 @@ static void rna_def_fluid_effector_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 10.0); RNA_def_property_ui_range(prop, 0.0, 10.0, 0.05, 5); RNA_def_property_ui_text( - prop, "Surface", "Distance around mesh surface to consider as effector"); + prop, "Surface", "Additional distance around mesh surface to consider as effector"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_plane_init", PROP_BOOLEAN, PROP_NONE); @@ -2549,11 +2554,6 @@ static void rna_def_fluid_effector_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Is Planar", "Treat this object as a planar, unclosed mesh"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); - prop = RNA_def_property(srna, "delete_in_obstacle", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flags", FLUID_DOMAIN_DELETE_IN_OBSTACLE); - RNA_def_property_ui_text(prop, "Clear In Obstacle", "Delete fluid inside obstacles"); - RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); - prop = RNA_def_property(srna, "velocity_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "vel_multi"); RNA_def_property_range(prop, -100.0, 100.0); |