[Bf-blender-cvs] [4bc10e6a819] fracture_modifier: allow rigidbody being a forcefield effector too

[Martin Felke]

Commit: 4bc10e6a819dbf6253423938cee146658df9b6da
Author: Martin Felke
Date:   Sat Dec 16 16:09:37 2017 +0100
Branches: fracture_modifier
https://developer.blender.org/rB4bc10e6a819dbf6253423938cee146658df9b6da

allow rigidbody being a forcefield effector too

this was disabled intentionally for some unknown reason

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index caf5dcf61ca..33ad9727084 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1757,9 +1757,9 @@ static void rigidbody_update_sim_ob(Scene *scene, RigidBodyWorld *rbw, Object *o
 			RB_body_set_loc_rot(rbo->physics_object, loc, rot);
 		}
 	}
-	/* update influence of effectors - but don't do it on an effector */
+	/* update influence of effectors - but don't do it on an effector (why not ?)*/
 	/* only dynamic bodies need effector update */
-	else if (rbo->type == RBO_TYPE_ACTIVE && ((ob->pd == NULL) || (ob->pd->forcefield == PFIELD_NULL))) {
+	else if (rbo->type == RBO_TYPE_ACTIVE /* && ((ob->pd == NULL) || (ob->pd->forcefield == PFIELD_NULL))*/) {
 		EffectorWeights *effector_weights = rbw->effector_weights;
 		EffectedPoint epoint;
 		ListBase *effectors;