diff options
6 files changed, 7 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 243efa961c9..d6d1678c294 100644 --- a/SConstruct +++ b/SConstruct @@ -346,9 +346,9 @@ elif sys.platform == 'win32': use_openal = 'true' use_fmod = 'false' use_quicktime = 'true' - use_sumo = 'false' + use_sumo = 'true' use_ode = 'false' - use_bullet = 'true' + use_bullet = 'false' use_buildinfo = 'true' build_blender_dynamic = 'true' build_blender_static = 'false' diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp index b0415c75d61..c430aedad7b 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp @@ -19,7 +19,7 @@ #include "ConstraintSolver/ConstraintSolver.h" #include "ConstraintSolver/ContactSolverInfo.h" #include "CollisionDispatch/ManifoldResult.h" -#include "NarrowphaseCollision/RaycastCallback.h" +#include "NarrowPhaseCollision/RaycastCallback.h" #include "CollisionShapes/TriangleMeshShape.h" diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp index 793c94804c0..1b4b9c61917 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp @@ -23,7 +23,7 @@ #include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" #include "NarrowPhaseCollision/ContinuousConvexCollision.h" -#include "NarrowPhaseCollision/SubsimplexConvexCast.h" +#include "NarrowPhaseCollision/SubSimplexConvexCast.h" #include "NarrowPhaseCollision/GjkConvexCast.h" diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp index 1bd9a39db97..10bb4af0a7d 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp @@ -13,7 +13,7 @@ #include "SimdVector3.h" #include "JacobianEntry.h" #include "ContactSolverInfo.h" -#include "GEN_minmax.h" +#include "GEN_MinMax.h" #define ASSERT2 assert diff --git a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp index a217291c756..d3b105dc7f6 100644 --- a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp +++ b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp @@ -1,7 +1,7 @@ #include "RigidBody.h" #include "MassProps.h" #include "CollisionShapes/ConvexShape.h" -#include "GEN_minmax.h" +#include "GEN_MinMax.h" #include <SimdTransformUtil.h> float gRigidBodyDamping = 0.5f; diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 5b6db434f8b..94ecfe27de2 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -4,7 +4,7 @@ #include <algorithm> #include "SimdTransform.h" #include "Dynamics/RigidBody.h" -#include "BroadphaseCollision/BroadPhaseInterface.h" +#include "BroadphaseCollision/BroadphaseInterface.h" #include "BroadphaseCollision/SimpleBroadphase.h" #include "CollisionShapes/ConvexShape.h" |