diff options
| author | Martin Felke <martin.felke@googlemail.com> | 2017-12-24 22:49:25 +0300 |
|---|---|---|
| committer | Martin Felke <martin.felke@googlemail.com> | 2017-12-24 22:49:25 +0300 |
| commit | a96832cd21900824eb2a7ccbe88dccf5ee29dcdc (patch) | |
| tree | 189107f91c1df140927cd2c67766ef0ea7a5a0c2 /source/blender/blenkernel/intern/rigidbody.c | |
| parent | 7babce30529a0fd9e21b963e836a888d44cf947d (diff) | |
fixes for cluster constraint island detection and a couple of minor fixes in fracture RNA
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 9db060c975d..924a2368c50 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -4046,7 +4046,9 @@ static bool check_constraint_island(FractureModifierData* fmd, MeshIsland *mi1, RB_shape_set_margin(mi2->rigidbody->physics_shape, is_near ? 0.0f : RBO_GET_MARGIN(mi2->rigidbody)); } - return ((mi1->constraint_index != mi2->constraint_index) || + return (((mi1->constraint_index != mi2->constraint_index) || + ((mi1->constraint_index == mi2->constraint_index) && + (mi1->particle_index != mi2->particle_index))) && (fmd->use_self_collision && is_near)); } |