From 64851b95574c77105e48eb1403a6a058d8f515f5 Mon Sep 17 00:00:00 2001 From: enn0x Date: Sat, 6 Jul 2013 00:27:04 +0000 Subject: [PATCH] Added missing NULL-check in BulletsoftBodyNode::attach_angular_joint. --- panda/src/bullet/bulletSoftBodyNode.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/bullet/bulletSoftBodyNode.cxx b/panda/src/bullet/bulletSoftBodyNode.cxx index d7aeb89cac..631325586b 100644 --- a/panda/src/bullet/bulletSoftBodyNode.cxx +++ b/panda/src/bullet/bulletSoftBodyNode.cxx @@ -1130,7 +1130,7 @@ append_angular_joint(BulletBodyNode *body, const LVector3 &axis, PN_stdfloat erp as.cfm = cfm; as.split = split; as.axis = LVecBase3_to_btVector3(axis); - as.icontrol = control; + as.icontrol = control ? control : btSoftBody::AJoint::IControl::Default(); _soft->appendAngularJoint(as, ptr); }