[Bf-blender-cvs] [a8226be] fracture_modifier: automatically trigger entire clusters now, if any
Martin Felke
noreply at git.blender.org
Sat Jun 13 09:22:50 CEST 2015
Commit: a8226be315299ac8579f08ada6b743f6590953ab
Author: Martin Felke
Date: Sat Jun 13 09:22:18 2015 +0200
Branches: fracture_modifier
https://developer.blender.org/rBa8226be315299ac8579f08ada6b743f6590953ab
automatically trigger entire clusters now, if any
===================================================================
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index f702cbc..caf2369 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1716,8 +1716,11 @@ static void do_activate(Object* ob, Object *ob2, MeshIsland *mi_compare, RigidBo
{
for (mi = fmd->meshIslands.first; mi; mi = mi->next)
{
+ bool same_cluster = (mi->particle_index != -1) &&
+ (mi->particle_index == mi_compare->particle_index);
+
RigidBodyOb* rbo = mi->rigidbody;
- if ((rbo->flag & RBO_FLAG_KINEMATIC) && ((mi_compare == mi)))
+ if ((rbo->flag & RBO_FLAG_KINEMATIC) && ((mi_compare == mi) || same_cluster))
{
if (rbo->physics_object) {
activateRigidbody(rbo, rbw, mi, ob);
More information about the Bf-blender-cvs
mailing list