- Charlie provided a work-around for some armature related crashes

- fixed some Bullet raycasting (hitfraction was not properly updated for static meshes)
- removed some cvs tags in Bullet's BMF _Font files (they keep on conflicting when duplicated in different repositories)
- set default linearsleepingtreshold explicitly

1 files changed, 3 insertions, 0 deletions

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index bc2352d713e..20498167021 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -300,6 +300,9 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 			{
 				CcdPhysicsEnvironment* ccdPhysEnv = new CcdPhysicsEnvironment();
 				ccdPhysEnv->setDebugDrawer(new BlenderDebugDraw());
+				ccdPhysEnv->setDeactivationLinearTreshold(0.8f); // default, can be overridden by Python
+				ccdPhysEnv->setDeactivationAngularTreshold(1.0f); // default, can be overridden by Python
+
 				//todo: get a button in blender ?
 				//disable / enable debug drawing (contact points, aabb's etc)	
 				//ccdPhysEnv->setDebugMode(1);