[Bf-blender-cvs] [a9e575ce65e] temp-fracture-modifier-2.8: fix attempt for having proper constraints with dynamic fracture again

[Martin Felke]

Commit: a9e575ce65edf36dbb7e9716671c56c29738caf5
Author: Martin Felke
Date:   Sun Dec 9 00:55:25 2018 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rBa9e575ce65edf36dbb7e9716671c56c29738caf5

fix attempt for having proper constraints with dynamic fracture again

"mixed" and "all" settings were basically not properly taken into account before

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

M	source/blender/blenkernel/intern/fracture_constraints.c
M	source/blender/blenkernel/intern/fracture_rigidbody.c

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

diff --git a/source/blender/blenkernel/intern/fracture_constraints.c b/source/blender/blenkernel/intern/fracture_constraints.c
index ec707eb086c..06649d4c7ec 100644
--- a/source/blender/blenkernel/intern/fracture_constraints.c
+++ b/source/blender/blenkernel/intern/fracture_constraints.c
@@ -112,7 +112,6 @@ static int prepareConstraintSearch(FractureModifierData *rmd, Shard ***mesh_isla
 
 	if (rmd->pack_group && (rmd->flag & MOD_FRACTURE_USE_GROUP_CONSTRAINTS_ONLY))
 	{
-
 		FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(rmd->pack_group, ob)
 		{
 			if (obj != ob)
@@ -493,6 +492,8 @@ void BKE_fracture_constraint_create(Scene* scene, FractureModifierData* fmd, Sha
 		rbsc->flag &= ~RBC_FLAG_DISABLE_COLLISIONS;
 	}
 
+	rbsc->flag |= RBC_FLAG_NEEDS_VALIDATE;
+
 	if ((mi1->cluster_index != -1) && (mi2->cluster_index != -1) &&
 		(mi1->cluster_index == mi2->cluster_index))
 	{
diff --git a/source/blender/blenkernel/intern/fracture_rigidbody.c b/source/blender/blenkernel/intern/fracture_rigidbody.c
index 6ecd0808e38..233fe0dddc6 100644
--- a/source/blender/blenkernel/intern/fracture_rigidbody.c
+++ b/source/blender/blenkernel/intern/fracture_rigidbody.c
@@ -2272,7 +2272,7 @@ bool BKE_rigidbody_modifier_update(Scene* scene, Object* ob, RigidBodyWorld *rbw
 					    !BKE_fracture_meshisland_check_frame(fmd, rbsc->mi2, frame))
 					{
 						//rbsc->flag |= RBC_FLAG_NEEDS_VALIDATE;
-						//BKE_rigidbody_validate_sim_shard_constraint(rbw, fmd, ob, rbsc, false);
+						BKE_rigidbody_validate_sim_shard_constraint(rbw, fmd, ob, rbsc, false);
 					}
 				}
 			}