diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-10-30 17:10:34 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
commit | a351e8b6ef81f07b400cf2b7389f8ac1c7bb7e6b (patch) | |
tree | 9f81f0b6dfe6a9498ccd247e1a94346be80a58d0 /release/scripts | |
parent | edc9baaae4d018739aff75fb70c9f3a47900be47 (diff) |
Reorganizing hair dynamics UI layout a bit to make settings slightly
more intuitive.
Also removed a couple of unused or useless features from the UI:
* collider friction is unused and replaced in favor of true collision
* spring damping refers to structural springs (stretch), which is
not noticable in hair due to extreme stiffness atm.
* pressure factors are not sure since this feature is too unstable atm.
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 351a949946a..4752b7578b5 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -308,30 +308,38 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): layout.enabled = psys.use_hair_dynamics and psys.point_cache.is_baked is False - split = layout.split() + split = layout.column() col = split.column() - col.label(text="Material:") - sub = col.column(align=True) - sub.prop(cloth, "pin_stiffness", text="Stiffness") - sub.prop(cloth, "mass") - sub.prop(cloth, "bending_stiffness", text="Bending") - sub.prop(cloth, "internal_friction", slider=True) - sub.prop(cloth, "collider_friction", slider=True) - sub.prop(cloth, "pressure", slider=True) - sub.prop(cloth, "pressure_threshold", slider=True) - - sub.separator() - - sub.prop(cloth, "voxel_resolution") + col.label(text="Structure") + col.prop(cloth, "mass") + sub = col.row(align=True) + sub.prop(cloth, "bending_stiffness", text="Stiffness") + sub.prop(cloth, "bending_damping", text="Damping") + # XXX has no noticable effect with stiff hair structure springs + #col.prop(cloth, "spring_damping", text="Damping") + + split.separator() col = split.column() - col.label(text="Damping:") - sub = col.column(align=True) - sub.prop(cloth, "spring_damping", text="Spring") - sub.prop(cloth, "air_damping", text="Air") - sub.prop(cloth, "bending_damping", text="Bending") + col.label(text="Volume") + col.prop(cloth, "air_damping", text="Air Drag") + col.prop(cloth, "internal_friction", slider=True) + sub = col.row(align=True) + # XXX disabled due to stability issues + #sub.prop(cloth, "pressure", slider=True, text="Pressure") + #sub.prop(cloth, "pressure_threshold", slider=True, text="Threshold") + col.prop(cloth, "voxel_resolution") + split.separator() + + col = split.column() + col.label(text="Pinning") + col.prop(cloth, "pin_stiffness", text="Goal Strength") + + split.separator() + + col = split.column() col.label(text="Quality:") col.prop(cloth, "quality", text="Steps", slider=True) |