Commit: e2672a433b744e53b52763523929c50364c10828
Author: Campbell Barton
Date: Mon May 12 14:55:54 2014 +1000
https://developer.blender.org/rBe2672a433b744e53b52763523929c50364c10828
Fix crash removing objects rigid body constraints
===================================================================
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index e198288..8e5b674 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);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
