From aa02ca126b327c701d5f019d61f00398bcd6c932 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Tue, 5 Feb 2013 21:51:17 +0000 Subject: rigidbody: Invert spring damping range Before 1 was no damping, which is inconsistent with the rest of the simulation. --- intern/rigidbody/rb_bullet_api.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/rigidbody') diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp index c4a4532bad1..4a3367ad768 100644 --- a/intern/rigidbody/rb_bullet_api.cpp +++ b/intern/rigidbody/rb_bullet_api.cpp @@ -915,7 +915,8 @@ void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float { btGeneric6DofSpringConstraint *constraint = reinterpret_cast(con); - constraint->setDamping(axis, damping); + // invert damping range so that 0 = no damping + constraint->setDamping(axis, 1.0f - damping); } void RB_constraint_set_spring_6dof_spring(rbConstraint *con, float axis, int enable) -- cgit v1.2.3