diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.cpp b/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.cpp index 35cad78fbb9..71a74f65bc2 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.cpp @@ -74,7 +74,7 @@ void ConvexTriangleCallback::ProcessTriangle(SimdVector3* triangle) input.m_maximumDistanceSquared = 1e30f;//? - gjkDetector.GetClosestPoints(input,output); + gjkDetector.GetClosestPoints(input,output,0); } diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp index 29736ee4cfc..5fd5ad595d4 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp @@ -17,13 +17,13 @@ #include "RAS_GLExtensionManager.h" #include "MT_assert.h" -#ifndef NDEBUG -#ifdef WIN32 -#define spit(x) std::cout << x << std::endl; -#endif //WIN32 -#else +//#ifndef NDEBUG +//#ifdef WIN32 +//#define spit(x) std::cout << x << std::endl; +//#endif //WIN32 +//#else #define spit(x) -#endif +//#endif RAS_ListSlot::RAS_ListSlot() : KX_ListSlot(),