[Bf-blender-cvs] [00054e28a41] fracture_modifier: do not check constraint islands in case constraint collision is activated (allow self collision)

[Martin Felke]

Commit: 00054e28a41fd95972f31b78d01d6296df64ef3b
Author: Martin Felke
Date:   Fri Jun 16 23:00:05 2017 +0200
Branches: fracture_modifier
https://developer.blender.org/rB00054e28a41fd95972f31b78d01d6296df64ef3b

do not check constraint islands in case constraint collision is activated (allow self collision)

===================================================================

M	source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index c844be77d24..53f27f095cb 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -2148,7 +2148,7 @@ static void fake_dynamic_collide(Object *ob1, Object *ob2, MeshIsland *mi1, Mesh
 
 static bool check_constraint_island(FractureModifierData* fmd, MeshIsland *mi1, MeshIsland *mi2)
 {
-	if (mi1 && mi2 && !fmd->use_compounds) {
+	if (mi1 && mi2 && !fmd->use_compounds && !fmd->use_constraint_collision) {
 		return mi1->constraint_index != mi2->constraint_index;
 	}