[Bf-blender-cvs] [c802ddb2a47] fracture_modifier: allow triggering in external mode too

[Martin Felke]

Commit: c802ddb2a47145f88e46415a99d7d68d65c212f4
Author: Martin Felke
Date:   Thu Jun 15 17:05:37 2017 +0200
Branches: fracture_modifier
https://developer.blender.org/rBc802ddb2a47145f88e46415a99d7d68d65c212f4

allow triggering in external mode too

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 7adf1779626..2c708a9de49 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -2164,6 +2164,7 @@ static int filterCallback(void* world, void* island1, void* island2, void *blend
 	FractureModifierData *fmd1 = (FractureModifierData*)modifiers_findByType((Object*)blenderOb1, eModifierType_Fracture);
 	FractureModifierData *fmd2 = (FractureModifierData*)modifiers_findByType((Object*)blenderOb2, eModifierType_Fracture);
 
+#if 0
 	if ((fmd1 && fmd1->fracture_mode == MOD_FRACTURE_EXTERNAL) ||
 	   (fmd2 && fmd2->fracture_mode == MOD_FRACTURE_EXTERNAL))
 	{
@@ -2173,6 +2174,7 @@ static int filterCallback(void* world, void* island1, void* island2, void *blend
 		ob2 = blenderOb2;
 		return check_colgroup_ghost(ob1, ob2);
 	}
+#endif
 
 	if (rbw == NULL)
 	{
@@ -4708,7 +4710,7 @@ static bool restoreKinematic(RigidBodyWorld *rbw)
 		if ((go->ob) && (go->ob->rigidbody_object) && (go->ob->rigidbody_object->flag & (RBO_FLAG_KINEMATIC | RBO_FLAG_USE_KINEMATIC_DEACTIVATION)))
 		{
 			FractureModifierData *fmd = (FractureModifierData*)modifiers_findByType(go->ob, eModifierType_Fracture);
-			if (fmd && fmd->fracture_mode != MOD_FRACTURE_EXTERNAL && go->ob->rigidbody_object->flag & RBO_FLAG_KINEMATIC)
+			if (fmd && /*fmd->fracture_mode != MOD_FRACTURE_EXTERNAL &&*/ go->ob->rigidbody_object->flag & RBO_FLAG_KINEMATIC)
 			{
 				MeshIsland* mi;
 				for (mi = fmd->meshIslands.first; mi; mi = mi->next)