[Bf-blender-cvs] [6158a98] master: BGE: Use references in CcdPhysicsEnvironment::RemoveConstraint.

Porteries Tristan noreply at git.blender.org
Sat Oct 17 21:50:08 CEST 2015


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);




More information about the Bf-blender-cvs mailing list