From e2672a433b744e53b52763523929c50364c10828 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 May 2014 14:55:54 +1000 Subject: Fix crash removing objects rigid body constraints --- source/blender/blenkernel/intern/rigidbody.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/rigidbody.c') diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index e198288ab7c..8e5b67404ac 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -935,10 +935,7 @@ void BKE_rigidbody_remove_object(Scene *scene, Object *ob) Object *obt = go->ob; if (obt && obt->rigidbody_constraint) { rbc = obt->rigidbody_constraint; - if (rbc->ob1 == ob) { - BKE_rigidbody_remove_constraint(scene, obt); - } - if (rbc->ob2 == ob) { + if (ELEM(ob, rbc->ob1, rbc->ob2)) { BKE_rigidbody_remove_constraint(scene, obt); } } -- cgit v1.2.3