[Bf-blender-cvs] [8fd65dc0e98] fracture_modifier: corrected some more special constraint breaking activation behavior (was activating too much)

[Martin Felke]

Commit: 8fd65dc0e98e16f33de3c4956f1f9254f4e1eebe
Author: Martin Felke
Date:   Wed Jan 17 00:12:49 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rB8fd65dc0e98e16f33de3c4956f1f9254f4e1eebe

corrected some more special constraint breaking activation behavior (was activating too much)

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 538b4e0c743..44d6a64a737 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -4009,7 +4009,7 @@ static bool do_activate(Object* ob, Object *ob2, MeshIsland *mi_compare, RigidBo
 
 			RigidBodyOb* rbo = mi->rigidbody;
 			if ((((rbo->flag & RBO_FLAG_KINEMATIC) || different_cluster) &&
-			     ((mi_compare == mi) || (same_cluster && !dissolve))) && valid)
+			     ((mi_compare == mi) /*|| (same_cluster && !dissolve)*/)) && valid)
 			{
 				if (rbo->physics_object && activate) {
 					activateRigidbody(rbo, rbw, mi, ob);
@@ -4693,16 +4693,16 @@ static void handle_breaking_percentage(FractureModifierData* fmd, Object *ob, Me
 					{
 						if (con->physics_constraint) {
 
-							//RB_constraint_set_enabled(con->physics_constraint, false);
-							if (con->mi1->rigidbody->flag & RBO_FLAG_KINEMATIC ||
+							RB_constraint_set_enabled(con->physics_constraint, false);
+							/*if (con->mi1->rigidbody->flag & RBO_FLAG_KINEMATIC ||
 							    con->mi2->rigidbody->flag & RBO_FLAG_KINEMATIC )
 							{
 								activateRigidbody(con->mi1->rigidbody, rbw, con->mi1, ob);
-								activateCluster(con->mi1, -1, rbw, ob);
+								activateCluster(con->mi1, con->mi1->particle_index, rbw, ob);
 
 								activateRigidbody(con->mi2->rigidbody, rbw, con->mi2, ob);
-								activateCluster(con->mi2, -1, rbw, ob);
-							}
+								activateCluster(con->mi2, con->mi2->particle_index, rbw, ob);
+							}*/
 						}
 					}
 				}
@@ -4846,8 +4846,8 @@ static void handle_breaking_angle(FractureModifierData *fmd, Object *ob, RigidBo
 		{
 			if (rbsc->physics_constraint) {
 				RB_constraint_set_enabled(rbsc->physics_constraint, false);
-				activateRigidbody(rbsc->mi1->rigidbody, rbw, rbsc->mi1, ob);
-				activateRigidbody(rbsc->mi2->rigidbody, rbw, rbsc->mi2, ob);
+				//activateRigidbody(rbsc->mi1->rigidbody, rbw, rbsc->mi1, ob);
+				//activateRigidbody(rbsc->mi2->rigidbody, rbw, rbsc->mi2, ob);
 			}
 		}
 	}
@@ -4881,8 +4881,8 @@ static void handle_breaking_distance(FractureModifierData *fmd, Object *ob, Rigi
 		{
 			if (rbsc->physics_constraint) {
 				RB_constraint_set_enabled(rbsc->physics_constraint, false);
-				activateRigidbody(rbsc->mi1->rigidbody, rbw, rbsc->mi1, ob);
-				activateRigidbody(rbsc->mi2->rigidbody, rbw, rbsc->mi2, ob);
+				//activateRigidbody(rbsc->mi1->rigidbody, rbw, rbsc->mi1, ob);
+				//activateRigidbody(rbsc->mi2->rigidbody, rbw, rbsc->mi2, ob);
 			}
 		}
 	}