diff options
author | Alexander Gavrilov <angavrilov@gmail.com> | 2016-07-31 11:56:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-31 11:57:19 +0300 |
commit | 64d4d6b134d5b36c43aa55e09ad92d8593a18269 (patch) | |
tree | 16f92a4f942ecb8d527093840a079889a1b10c08 /release | |
parent | 710ab5be36cda9cba547502d5327f400f15935bc (diff) |
Support limiting collisions by group for softbody and particles
This feature is extremely useful for layering multiple cloth objects,
and there is no reason there shouldn't be the same kind of feature for softbody.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_softbody.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 08290f20a69..c2580d4ac71 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -605,6 +605,8 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): row.prop(part, "use_size_deflect") row.prop(part, "use_die_on_collision") + layout.prop(part, "collision_group") + if part.physics_type == 'FLUID': fluid = part.fluid diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index c96f455a105..a458af739f2 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -68,6 +68,8 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, Panel): col.label(text="Simulation:") col.prop(softbody, "speed") + layout.prop(softbody, "collision_group") + class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel): bl_label = "Soft Body Cache" |