[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35269] trunk/blender/source/gameengine: BGE fix: complement to recent patch for Rigid Body Constraint.

[Dalai Felinto]

Revision: 35269
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35269
Author:   dfelinto
Date:     2011-02-28 20:22:28 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
BGE fix: complement to recent patch for Rigid Body Constraint. patch by Juha M?\195?\164ki-Kanto (kanttori)

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2011-02-28 19:48:56 UTC (rev 35268)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2011-02-28 20:22:28 UTC (rev 35269)
@@ -2658,8 +2658,7 @@
 									
 									for (dof=3;dof<6;dof++)
 									{
-										// flag only applies to angular limit x
-										if(dof != 3 || dat->flag & dofbit)
+										if(dat->flag & dofbit)
 										{
 											kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,dat->minLimit[dof],dat->maxLimit[dof]);
 										}

Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2011-02-28 19:48:56 UTC (rev 35268)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2011-02-28 20:22:28 UTC (rev 35269)
@@ -2001,7 +2001,10 @@
 				{
 					//param = 3,4,5 are constraint limits, high limit values
 					btConeTwistConstraint* coneTwist = (btConeTwistConstraint*)typedConstraint;
-					coneTwist->setLimit(param,value1);
+					if(value1<0.0f)
+						coneTwist->setLimit(param,btScalar(BT_LARGE_FLOAT));
+					else
+						coneTwist->setLimit(param,value1);
 					break;
 				}
 			default: