[Bf-blender-cvs] [f0aef2afe99] fracture_modifier: let neighbor shards now only be stopped if propagate trigger is enabled

[Martin Felke]

Commit: f0aef2afe9990e7700b1c2c513b901e7ffd6b2da
Author: Martin Felke
Date:   Sun Sep 2 22:09:47 2018 +0200
Branches: fracture_modifier
https://developer.blender.org/rBf0aef2afe9990e7700b1c2c513b901e7ffd6b2da

let neighbor shards now only be stopped if propagate trigger is enabled

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 243b467228b..8d2291ef263 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -4856,7 +4856,7 @@ static void test_deactivate_rigidbody(RigidBodyOb *rbo, MeshIsland* mi)
 			rbo->flag |= RBO_FLAG_KINEMATIC_REBUILD;
 			rbo->flag |= RBO_FLAG_NEEDS_VALIDATE;
 
-			if (mi != NULL)
+			if ((mi != NULL) && (rbo->flag & RBO_FLAG_PROPAGATE_TRIGGER))
 			{
 				for (i = 0; i < mi->participating_constraint_count; i++)
 				{