Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-03-16 21:10:25 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-03-17 13:57:04 +0300
commit20d7c04305a39bc18d483baba26dfb54960bb92a (patch)
tree7357ca92ccdf0ab06e277af4aee313321b93fafe
parent7f3e84deb5aff74106c29965b70664cdb9883ed8 (diff)
Fluid: Re-dded Empty Space option in the UI
This option existed already and was just hidden in the UI. With the new fluids system though, it will only be used for rendering - and not to optimize the cache.
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_fluid.py3
-rw-r--r--source/blender/blenkernel/intern/fluid.c2
-rw-r--r--source/blender/makesrna/intern/rna_fluid.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index ba21fe47519..65992a4e4e9 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -192,8 +192,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
sub.prop(domain, "gravity", text="Using Scene Gravity", icon='SCENE_DATA')
else:
col.prop(domain, "gravity", text="Gravity")
- # TODO (sebbas): Clipping var useful for manta openvdb caching?
- # col.prop(domain, "clipping", text="Empty Space")
+ col.prop(domain, "clipping", text="Empty Space")
if domain.cache_type == 'MODULAR':
col.separator()
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 366137b5fa6..33124bd23a5 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -4851,7 +4851,7 @@ void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd)
#else
mmd->domain->openvdb_comp = VDB_COMPRESSION_ZIP;
#endif
- mmd->domain->clipping = 1e-3f;
+ mmd->domain->clipping = 1e-6f;
mmd->domain->data_depth = 0;
}
else if (mmd->type & MOD_FLUID_TYPE_FLOW) {
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 7bd353cd441..b4543ea4b38 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -2209,11 +2209,11 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "clipping", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "clipping");
RNA_def_property_range(prop, 0.0, 1.0);
- RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 3);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 6);
RNA_def_property_ui_text(
prop,
"Clipping",
- "Value under which voxels are considered empty space to optimize caching and rendering");
+ "Value under which voxels are considered empty space to optimize rendering");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
/* -- Deprecated / unsed options (below)-- */