bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fluid: Naming and UI visibility fixes for some parameters

Browse Source 
Cleaned up some inconsistencies in the UI, i.e. corrected name for velocity factor and fixed UI visibility for fractional obstacle parameter.
This commit is contained in:
Sebastián Barschkis 2020-02-12 00:45:01 +01:00
parent df45257ec5
commit 7e99e396a9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,8 +481,9 @@ class PHYSICS_PT_liquid(PhysicButtonsPanel, Panel):
col = flow.column()
col.prop(domain, "use_fractions", text="Fractional Obstacles")
col.active = domain.use_fractions
col.prop(domain, "fractions_threshold", text="Obstacle-Fluid Threshold")
col1 = col.column()
col1.enabled = domain.use_fractions
col1.prop(domain, "fractions_threshold", text="Obstacle-Fluid Threshold")
class PHYSICS_PT_flow_source(PhysicButtonsPanel, Panel):
@ -1145,7 +1146,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel):
if md.domain_settings.domain_type in {'LIQUID'}:
# File format for all particle systemes (FLIP and secondary)
col = flow.column()
col.enabled = not is_baking_any and not has_baked_particles
col.enabled = not is_baking_any and not has_baked_particles and not has_baked_data
col.prop(domain, "cache_particle_format", text="Particle File Format")
if domain.use_mesh:

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

@ -1326,6 +1326,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
RNA_def_property_enum_items(prop, domain_types);
RNA_def_property_enum_funcs(prop, NULL, "rna_Fluid_domaintype_set", NULL);
RNA_def_property_ui_text(prop, "Domain Type", "Change domain type of the simulation");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Fluid_flip_parts_update");
/* smoke domain options */
@ -1865,7 +1866,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0, 100.0);
RNA_def_property_ui_text(
prop,
"Weight",
"Velocity Factor",
"Guiding velocity factor (higher value results in greater guiding velocities)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset");