diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-12 08:55:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-12 08:55:54 +0400 |
| commit | e2672a433b744e53b52763523929c50364c10828 (patch) | |
| tree | 44c9a658134701ab3697cfda613f6b63f194cd93 /source/blender/blenkernel/intern/rigidbody.c | |
| parent | d1526da787fba050391747a9286f9e0521c6f2d1 (diff) | |
Fix crash removing objects rigid body constraints
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); } } |