[Bf-blender-cvs] [0109c52ea74] fluid-mantaflow: Mantaflow: Small adjustments to surface-distance parameter
Sebastián Barschkis
noreply at git.blender.org
Fri Nov 22 13:02:49 CET 2019
Commit: 0109c52ea74a6444b92fb8f06e990f0aaec03042
Author: Sebastián Barschkis
Date: Fri Nov 22 13:02:38 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB0109c52ea74a6444b92fb8f06e990f0aaec03042
Mantaflow: Small adjustments to surface-distance parameter
Better default values
===================================================================
M source/blender/blenkernel/intern/manta.c
M source/blender/makesrna/intern/rna_manta.c
===================================================================
diff --git a/source/blender/blenkernel/intern/manta.c b/source/blender/blenkernel/intern/manta.c
index 8b75ce37bd2..7468beb788a 100644
--- a/source/blender/blenkernel/intern/manta.c
+++ b/source/blender/blenkernel/intern/manta.c
@@ -840,7 +840,7 @@ void mantaModifier_createType(struct MantaModifierData *mmd)
mmd->flow->fuel_amount = 1.0f;
mmd->flow->temp = 1.0f;
mmd->flow->volume_density = 0.0f;
- mmd->flow->surface_distance = 0.5f;
+ mmd->flow->surface_distance = 1.5f;
mmd->flow->particle_size = 1.0f;
mmd->flow->subframes = 0;
@@ -864,7 +864,7 @@ void mantaModifier_createType(struct MantaModifierData *mmd)
mmd->effec->mesh = NULL;
mmd->effec->verts_old = NULL;
mmd->effec->numverts = 0;
- mmd->effec->surface_distance = 0.5f;
+ mmd->effec->surface_distance = 0.0f;
mmd->effec->type = FLUID_EFFECTOR_TYPE_COLLISION;
mmd->effec->flags = 0;
diff --git a/source/blender/makesrna/intern/rna_manta.c b/source/blender/makesrna/intern/rna_manta.c
index d52195c1e54..c53e4aa3bcc 100644
--- a/source/blender/makesrna/intern/rna_manta.c
+++ b/source/blender/makesrna/intern/rna_manta.c
@@ -981,7 +981,7 @@ static void rna_Manta_flowtype_set(struct PointerRNA *ptr, int value)
/* Force flow source to mesh */
if (value == FLUID_FLOW_TYPE_LIQUID) {
rna_Manta_flowsource_set(ptr, FLUID_FLOW_SOURCE_MESH);
- settings->surface_distance = 0.5f;
+ settings->surface_distance = 0.0f;
}
else {
settings->surface_distance = 1.5f;
@@ -2412,7 +2412,7 @@ static void rna_def_manta_flow_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "surface_distance", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0.0, 10.0);
- RNA_def_property_ui_range(prop, 0.5, 5.0, 0.05, 5);
+ RNA_def_property_ui_range(prop, 0.0, 10.0, 0.05, 5);
RNA_def_property_ui_text(prop, "Surface", "Maximum distance from mesh surface to emit fluid");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Manta_reset");
@@ -2542,7 +2542,7 @@ static void rna_def_manta_effec_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "surface_distance", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0.0, 10.0);
- RNA_def_property_ui_range(prop, 0.5, 5.0, 0.05, 5);
+ 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");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Manta_reset");
More information about the Bf-blender-cvs
mailing list