[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54340] trunk/blender/intern/rigidbody/ rb_bullet_api.cpp: rigidbody: Invert spring damping range

[Sergej Reich]

Revision: 54340
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54340
Author:   sergof
Date:     2013-02-05 21:51:17 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
rigidbody: Invert spring damping range

Before 1 was no damping, which is inconsistent with the rest of the
simulation.

Modified Paths:
--------------
    trunk/blender/intern/rigidbody/rb_bullet_api.cpp

Modified: trunk/blender/intern/rigidbody/rb_bullet_api.cpp
===================================================================
--- trunk/blender/intern/rigidbody/rb_bullet_api.cpp	2013-02-05 21:51:15 UTC (rev 54339)
+++ trunk/blender/intern/rigidbody/rb_bullet_api.cpp	2013-02-05 21:51:17 UTC (rev 54340)
@@ -915,7 +915,8 @@
 {
 	btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(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)