Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fluid: Removed domain size option from diffusion panel

Browse Source 
Domain size parameter no longer needed (unsed right now). Domain size is directly taken from object.
This commit is contained in:
Sebastián Barschkis
2020-04-30 15:40:47 +02:00
parent 4d63dfca4c
commit 9ee7fc15af
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/properties_physics_fluid.py
View File

@@ -1002,7 +1002,6 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel):
col.prop(domain, "viscosity_exponent", text="Exponent", slider=True) col.prop(domain, "viscosity_exponent", text="Exponent", slider=True)
col = flow.column() col = flow.column()
col.prop(domain, "domain_size", text="Real World Size")
col.prop(domain, "surface_tension", text="Surface Tension") col.prop(domain, "surface_tension", text="Surface Tension")

2
source/blender/blenkernel/intern/fluid.c
View File

@@ -4889,7 +4889,6 @@ void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd)
mmd->domain->surface_tension = 0.0f; mmd->domain->surface_tension = 0.0f;
mmd->domain->viscosity_base = 1.0f; mmd->domain->viscosity_base = 1.0f;
mmd->domain->viscosity_exponent = 6.0f; mmd->domain->viscosity_exponent = 6.0f;
mmd->domain->domain_size = 0.5f;
/* mesh options */ /* mesh options */
mmd->domain->mesh_velocities = NULL; mmd->domain->mesh_velocities = NULL;
@@ -5133,7 +5132,6 @@ void BKE_fluid_modifier_copy(const struct FluidModifierData *mmd,
tmds->surface_tension = mds->surface_tension; tmds->surface_tension = mds->surface_tension;
tmds->viscosity_base = mds->viscosity_base; tmds->viscosity_base = mds->viscosity_base;
tmds->viscosity_exponent = mds->viscosity_exponent; tmds->viscosity_exponent = mds->viscosity_exponent;
tmds->domain_size = mds->domain_size;
/* mesh options */ /* mesh options */
if (mds->mesh_velocities) { if (mds->mesh_velocities) {

3
source/blender/makesdna/DNA_fluid_types.h
View File

@@ -393,7 +393,6 @@ typedef struct FluidDomainSettings {
float surface_tension; float surface_tension;
float viscosity_base; float viscosity_base;
int viscosity_exponent; int viscosity_exponent;
float domain_size;
/* Mesh options. */ /* Mesh options. */
float mesh_concave_upper; float mesh_concave_upper;
@@ -404,7 +403,7 @@ typedef struct FluidDomainSettings {
int mesh_scale; int mesh_scale;
int totvert; int totvert;
short mesh_generator; short mesh_generator;
char _pad5[2]; /* Unused. */ char _pad5[6]; /* Unused. */
/* Secondary particle options. */ /* Secondary particle options. */
int particle_type; int particle_type;

5
source/blender/makesrna/intern/rna_fluid.c
View File

@@ -1687,11 +1687,6 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
"e.g. 5*10^-6)"); "e.g. 5*10^-6)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_datacache_reset"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_datacache_reset");
prop = RNA_def_property(srna, "domain_size", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0.001, 10000.0);
RNA_def_property_ui_text(prop, "Meters", "Domain size in meters (longest domain side)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_domain_reset");
/* mesh options options */ /* mesh options options */
prop = RNA_def_property(srna, "mesh_concave_upper", PROP_FLOAT, PROP_NONE); prop = RNA_def_property(srna, "mesh_concave_upper", PROP_FLOAT, PROP_NONE);