From 3ca158265a23f4a5b26fc19278c436b3a5465e23 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 2 Jun 2016 16:44:13 -0700 Subject: [PATCH] Make sure getVelocityChange returns the velocityChange --- libraries/physics/src/CharacterController.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp index 1c8a9b50b5..30fb3536ca 100644 --- a/libraries/physics/src/CharacterController.cpp +++ b/libraries/physics/src/CharacterController.cpp @@ -401,11 +401,10 @@ glm::vec3 CharacterController::getLinearVelocity() const { } glm::vec3 CharacterController::getVelocityChange() const { - glm::vec3 velocity(0.0f); if (_rigidBody) { - velocity = bulletToGLM(_rigidBody->getLinearVelocity()); + return bulletToGLM(_velocityChange); } - return velocity; + return glm::vec3(0.0f); } void CharacterController::clearMotors() {