diff options
author | Martin Felke <martin.felke@googlemail.com> | 2017-12-16 18:09:37 +0300 |
---|---|---|
committer | Martin Felke <martin.felke@googlemail.com> | 2017-12-16 18:09:37 +0300 |
commit | 4bc10e6a819dbf6253423938cee146658df9b6da (patch) | |
tree | 65428202736ec4563503a429bb1c8ebf4fc3ce1e /source/blender/blenkernel/intern/rigidbody.c | |
parent | aacada54f83de91c01495003c4614a956c15f3f9 (diff) |
allow rigidbody being a forcefield effector too
this was disabled intentionally for some unknown reason
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |