From 424fde9112a59ef7448ff2ec8d0b2c46bf80d594 Mon Sep 17 00:00:00 2001 From: enn0x Date: Sat, 19 Nov 2011 13:19:52 +0000 Subject: [PATCH] Bugfix: setting angular/linear sleep threshold have been swapped. --- panda/src/bullet/bulletRigidBodyNode.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/bullet/bulletRigidBodyNode.cxx b/panda/src/bullet/bulletRigidBodyNode.cxx index ae8349c88d..a9aeaaf41a 100644 --- a/panda/src/bullet/bulletRigidBodyNode.cxx +++ b/panda/src/bullet/bulletRigidBodyNode.cxx @@ -426,7 +426,7 @@ get_angular_sleep_threshold() const { void BulletRigidBodyNode:: set_linear_sleep_threshold(PN_stdfloat threshold) { - _rigid->setSleepingThresholds(_rigid->getLinearSleepingThreshold(), threshold); + _rigid->setSleepingThresholds(threshold, _rigid->getAngularSleepingThreshold()); } //////////////////////////////////////////////////////////////////// @@ -437,7 +437,7 @@ set_linear_sleep_threshold(PN_stdfloat threshold) { void BulletRigidBodyNode:: set_angular_sleep_threshold(PN_stdfloat threshold) { - _rigid->setSleepingThresholds(threshold, _rigid->getAngularSleepingThreshold()); + _rigid->setSleepingThresholds(_rigid->getLinearSleepingThreshold(), threshold); } ////////////////////////////////////////////////////////////////////