updated vc7 projectfiles so they work with bullet

2 files changed, 6 insertions, 0 deletions

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 4db080e02db..8171baf689d 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -260,6 +260,9 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 			{
 				CcdPhysicsEnvironment* ccdPhysEnv = new CcdPhysicsEnvironment();
 				ccdPhysEnv->setDebugDrawer(new BlenderDebugDraw());
+			
+			//disable / enable debug drawing (contact points, aabb's etc)	
+		//		ccdPhysEnv->setDebugMode(1);
 				destinationscene->SetPhysicsEnvironment(ccdPhysEnv);
 				break;
 			}
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index db5d6fa1347..338e9448e94 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -864,6 +864,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 {
 
 		CcdPhysicsEnvironment* env = (CcdPhysicsEnvironment*)kxscene->GetPhysicsEnvironment();
+		
 	assert(env);
 
 
@@ -928,6 +929,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 			);
 			bm = new CylinderShapeZ(halfExtents);
 			bm->CalculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
+			bm->SetMargin(0.05f);
 
 			break;
 		}
@@ -946,6 +948,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 				bm = new ConeShape(objprop->m_boundobject.c.m_radius,objprop->m_boundobject.c.m_height);
 				bm->CalculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
 
+				bm->SetMargin(0.05f);
 
 
 			break;