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-02-12 02:45:01 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-02-12 02:45:21 +0300
commit7e99e396a9991538d3a2d34a69b7a1cf1cbce7d8 (patch)
tree3c945885d25aec1d87b89afdf9259ec4931984a4 /release
parentdf45257ec53c795081e65a35784bd89ac8c3e83d (diff)
Fluid: Naming and UI visibility fixes for some parameters
Cleaned up some inconsistencies in the UI, i.e. corrected name for velocity factor and fixed UI visibility for fractional obstacle parameter.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_fluid.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 7c2077a178c..1eaaeb81772 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -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: