diff options
author | Jacques Lucke <jacques@blender.org> | 2020-02-20 11:27:28 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-02-20 11:27:28 +0300 |
commit | fcfe9784cbc42df3ca000c4d11727c12cb2df5c9 (patch) | |
tree | 77d689b10bd940bba8e73230bf031106052741a2 /release | |
parent | 3b1c34267be6b476acfb2a63d7101c73a516f5db (diff) | |
parent | 2a6df7dfe5ae9c25780166771c56ff921cc90f63 (diff) |
Merge branch 'master' into functions
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 310f1d6f8dc..4d6d3d8f607 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -875,18 +875,18 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel): col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_tau_max_wc", text="Wave Crest Potential Maximum") - col.prop(domain, "sndparticle_tau_min_wc", text="Minimum") + col.prop(domain, "sndparticle_potential_max_wavecrest", text="Wave Crest Potential Maximum") + col.prop(domain, "sndparticle_potential_min_wavecrest", text="Minimum") col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_tau_max_ta", text="Trapped Air Potential Maximum") - col.prop(domain, "sndparticle_tau_min_ta", text="Minimum") + col.prop(domain, "sndparticle_potential_max_trappedair", text="Trapped Air Potential Maximum") + col.prop(domain, "sndparticle_potential_min_trappedair", text="Minimum") col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_tau_max_k", text="Kinetic Energy Potential Maximum") - col.prop(domain, "sndparticle_tau_min_k", text="Minimum") + col.prop(domain, "sndparticle_potential_max_energy", text="Kinetic Energy Potential Maximum") + col.prop(domain, "sndparticle_potential_min_energy", text="Minimum") col.separator() col = flow.column(align=True) @@ -895,18 +895,18 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel): col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_k_wc", text="Wave Crest Particle Sampling") - col.prop(domain, "sndparticle_k_ta", text="Trapped Air Particle Sampling") + col.prop(domain, "sndparticle_sampling_wavecrest", text="Wave Crest Particle Sampling") + col.prop(domain, "sndparticle_sampling_trappedair", text="Trapped Air Particle Sampling") col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_l_max", text="Particle Life Maximum") - col.prop(domain, "sndparticle_l_min", text="Minimum") + col.prop(domain, "sndparticle_life_max", text="Particle Life Maximum") + col.prop(domain, "sndparticle_life_min", text="Minimum") col.separator() col = flow.column(align=True) - col.prop(domain, "sndparticle_k_b", text="Bubble Buoyancy") - col.prop(domain, "sndparticle_k_d", text="Bubble Drag") + col.prop(domain, "sndparticle_bubble_buoyancy", text="Bubble Buoyancy") + col.prop(domain, "sndparticle_bubble_drag", text="Bubble Drag") col.separator() col = flow.column() |