Commit: 6158a9826dc821e158b66f7521197c7fe7be0b09
Author: Porteries Tristan
Date: Sat Oct 17 21:44:40 2015 +0200
Branches: master
https://developer.blender.org/rB6158a9826dc821e158b66f7521197c7fe7be0b09
BGE: Use references in CcdPhysicsEnvironment::RemoveConstraint.
It avoids assert calls on rigid body destructor.
===================================================================
M source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index 1b7267b..bf81a18 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -513,8 +513,8 @@ void
CcdPhysicsEnvironment::AddCcdPhysicsController(CcdPhysicsController* ctrl)
void CcdPhysicsEnvironment::RemoveConstraint(btTypedConstraint *con)
{
- btRigidBody rbA = con->getRigidBodyA();
- btRigidBody rbB = con->getRigidBodyB();
+ btRigidBody &rbA = con->getRigidBodyA();
+ btRigidBody &rbB = con->getRigidBodyB();
rbA.activate();
rbB.activate();
m_dynamicsWorld->removeConstraint(con);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
