From ae27a548f87e938facffc02f015e4a11d45f24cd Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Mon, 4 Feb 2013 23:50:31 +0000 Subject: [PATCH] rigidbody: Fix [#34106] Deleting an object with Bullet Constraint crashes Blender Constraints are deleted before rigid bodies so need to check if constraint exists in case both the constraint and ridid body are on the same object. --- source/blender/blenkernel/intern/rigidbody.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 7cab0d7471f..bbcb77ef191 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -853,7 +853,7 @@ void BKE_rigidbody_remove_object(Scene *scene, Object *ob) if (rbw->constraints) { for (go = rbw->constraints->gobject.first; go; go = go->next) { Object *obt = go->ob; - if (obt) { + if (obt && obt->rigidbody_constraint) { rbc = obt->rigidbody_constraint; if (rbc->ob1 == ob) { rbc->ob1 = NULL;