[Bf-blender-cvs] [f811c08407f] fracture_modifier: restore ghost stop trigger functionality

[Martin Felke]

Commit: f811c08407f483de0ecc14673366546e54b1ab7e
Author: Martin Felke
Date:   Sat Jul 28 13:05:28 2018 +0200
Branches: fracture_modifier
https://developer.blender.org/rBf811c08407f483de0ecc14673366546e54b1ab7e

restore ghost stop trigger functionality

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index e4622dd57ca..4f6a32a984f 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -4315,12 +4315,14 @@ static int filterCallback(void* world, void* island1, void* island2, void *blend
 
 		if (ob1->rigidbody_object->flag & RBO_FLAG_USE_KINEMATIC_DEACTIVATION)
 		{
-			check_activate = do_activate(ob1, ob2, mi1, rbw, mi2, activate);
+			bool override = activate || (ob2->rigidbody_object->flag & RBO_FLAG_ANTI_TRIGGER);
+			check_activate = do_activate(ob1, ob2, mi1, rbw, mi2, override);
 		}
 
 		if (ob2->rigidbody_object->flag & RBO_FLAG_USE_KINEMATIC_DEACTIVATION)
 		{
-			check_activate = do_activate(ob2, ob1, mi2, rbw, mi1, activate);
+			bool override = activate || (ob1->rigidbody_object->flag & RBO_FLAG_ANTI_TRIGGER);
+			check_activate = do_activate(ob2, ob1, mi2, rbw, mi1, override);
 		}
 	}