Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Bernal <jbernalmartinez@gmail.com>2015-10-30 08:49:43 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-10-30 08:51:22 +0300
commitd2af1401510200bcc5d1841d5ef186e7cb545133 (patch)
treeae4578fefaa91bac406fb3a90d9359d390132e53 /source/gameengine/Physics
parentc03598955bc7bbf42664d9fdfbeec59c61639e65 (diff)
BGE: Fix SetMass function affecting own object gravity.
Each time we setted the mass the own object gravity was divided by its old mass (i.e you could convert you car in a flying DeLorean with a simple mass car modification). A note will be included in release notes due to retro compability issues.
Diffstat (limited to 'source/gameengine/Physics')
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index dba65c04729..7917f47019d 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1194,16 +1194,12 @@ void CcdPhysicsController::SetMass(MT_Scalar newmass)
btRigidBody *body = GetRigidBody();
if (body && !m_suspended && newmass>MT_EPSILON && GetMass()>MT_EPSILON)
{
- btVector3 grav = body->getGravity();
- btVector3 accel = grav / GetMass();
-
btBroadphaseProxy* handle = body->getBroadphaseHandle();
GetPhysicsEnvironment()->UpdateCcdPhysicsController(this,
newmass,
body->getCollisionFlags(),
handle->m_collisionFilterGroup,
handle->m_collisionFilterMask);
- body->setGravity(accel);
}
}