Fluid: Removed domain size option from diffusion panel
Domain size parameter no longer needed (unsed right now). Domain size is directly taken from object.
This commit is contained in:
parent
4d63dfca4c
commit
9ee7fc15af
|
@ -1002,7 +1002,6 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel):
|
|||
col.prop(domain, "viscosity_exponent", text="Exponent", slider=True)
|
||||
|
||||
col = flow.column()
|
||||
col.prop(domain, "domain_size", text="Real World Size")
|
||||
col.prop(domain, "surface_tension", text="Surface Tension")
|
||||
|
||||
|
||||
|
|
|
@ -4889,7 +4889,6 @@ void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd)
|
|||
mmd->domain->surface_tension = 0.0f;
|
||||
mmd->domain->viscosity_base = 1.0f;
|
||||
mmd->domain->viscosity_exponent = 6.0f;
|
||||
mmd->domain->domain_size = 0.5f;
|
||||
|
||||
/* mesh options */
|
||||
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->viscosity_base = mds->viscosity_base;
|
||||
tmds->viscosity_exponent = mds->viscosity_exponent;
|
||||
tmds->domain_size = mds->domain_size;
|
||||
|
||||
/* mesh options */
|
||||
if (mds->mesh_velocities) {
|
||||
|
|
|
@ -393,7 +393,6 @@ typedef struct FluidDomainSettings {
|
|||
float surface_tension;
|
||||
float viscosity_base;
|
||||
int viscosity_exponent;
|
||||
float domain_size;
|
||||
|
||||
/* Mesh options. */
|
||||
float mesh_concave_upper;
|
||||
|
@ -404,7 +403,7 @@ typedef struct FluidDomainSettings {
|
|||
int mesh_scale;
|
||||
int totvert;
|
||||
short mesh_generator;
|
||||
char _pad5[2]; /* Unused. */
|
||||
char _pad5[6]; /* Unused. */
|
||||
|
||||
/* Secondary particle options. */
|
||||
int particle_type;
|
||||
|
|
|
@ -1687,11 +1687,6 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
"e.g. 5*10^-6)");
|
||||
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 */
|
||||
|
||||
prop = RNA_def_property(srna, "mesh_concave_upper", PROP_FLOAT, PROP_NONE);
|
||||
|
|
Loading…
Reference in New Issue