diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
| commit | a377a7edf67869722c585086ac6ab1f295cbff87 (patch) | |
| tree | 1736de08fe9174761607dce5d54a16af25eba049 /source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | |
| parent | 08232350d5797302e3638e69ec78657d853976aa (diff) | |
| parent | b743454ce1c361e6161da8ae5f840c2befe3a081 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32300:32571soc-2010-nicolasbishop
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 061220ce0c1..1888e7cf7b8 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -38,7 +38,6 @@ #include "RAS_MeshObject.h" #include "KX_Scene.h" #include "SYS_System.h" -#include "BulletSoftBody/btSoftBody.h" #include "PHY_Pro.h" //todo cleanup #include "KX_ClientObjectInfo.h" @@ -56,6 +55,7 @@ extern "C"{ } #ifdef USE_BULLET +#include "BulletSoftBody/btSoftBody.h" #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" @@ -561,4 +561,4 @@ bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *fro spc->ReplaceControllerShape(bm); return true; } -#endif +#endif // USE_BULLET |