[Bf-blender-cvs] [751d235] fracture_modifier: crash fix with FM and forcefields

Martin Felke noreply at git.blender.org
Mon Dec 19 22:50:57 CET 2016


Commit: 751d2354c2e3da4e39ed98460127c526e9d0b288
Author: Martin Felke
Date:   Mon Dec 19 22:34:49 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rB751d2354c2e3da4e39ed98460127c526e9d0b288

crash fix with FM and forcefields

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 43c2aa5..a3cf18d 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -3510,7 +3510,7 @@ static void rigidbody_update_sim_ob(Scene *scene, RigidBodyWorld *rbw, Object *o
 			pdDoEffectors(effectors, NULL, effector_weights, &epoint, eff_force, NULL);
 			if ((rbo->flag & RBO_FLAG_KINEMATIC) && (thresh < len_squared_v3(eff_force)))
 			{
-				activateRigidbody(rbo, NULL, NULL, NULL);
+				activateRigidbody(rbo, rbw, mi, ob);
 				RB_body_apply_central_force(rbo->physics_object, eff_force);
 			}
 			else if (rbo->flag & RBO_FLAG_KINEMATIC)




More information about the Bf-blender-cvs mailing list