blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #32022, #43188, #100373, Armature modifier - Preserve volume + Scale #108134

Merged
Nathan Vegdahl merged 13 commits from himisa/blender:main into main 2023-06-06 12:32:00 +02:00
Conversation 15 Commits 13 Files Changed 1 +1 -13
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f6a94de0eb - Show all commits

14
intern/rigidbody/rb_bullet_api.cpp
View File

@ -352,13 +352,7 @@ void RB_body_delete(rbRigidBody *object)
* but since we delete everything when the world is rebult, we need to do it manually here */
for (int i = body->getNumConstraintRefs() - 1; i >= 0; i--) {
btTypedConstraint *con = body->getConstraintRef(i);
if (con->isEnabled()) {
con->getRigidBodyA().removeConstraintRef(con);
con->getRigidBodyB().removeConstraintRef(con);
con->setEnabled(false);
}
body->removeConstraintRef(con);
}
delete body;
@ -1125,12 +1119,6 @@ rbConstraint *RB_constraint_new_motor(float pivot[3],
void RB_constraint_delete(rbConstraint *con)
{
btTypedConstraint *constraint = reinterpret_cast<btTypedConstraint *>(con);
if (constraint->isEnabled()) {
constraint->getRigidBodyA().removeConstraintRef(constraint);
constraint->getRigidBodyB().removeConstraintRef(constraint);
}
delete constraint;
}