From 29feb5a931bd16d59860fd5378018cd226e215b0 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Wed, 8 Apr 2015 22:09:58 +0200 Subject: [PATCH 1/2] Modification of the README file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23d4467b..ca153b31 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ You can find the User Manual and the Doxygen API Documentation [here](http://www ## Branches -The "master" branch always contains the last released version of the library. This is the most stable version. On the other side, +The "master" branch always contains the last released version of the library and some possible bug fixes. This is the most stable version. On the other side, the "develop" branch is used for development. This branch is frequently updated and can be quite unstable. Therefore, if you want to use the library in your application, it is recommended to checkout the "master" branch. From 3aaac820e0d184959033b98b26b7811ac86935bb Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Wed, 8 Apr 2015 22:10:34 +0200 Subject: [PATCH 2/2] Fix compilation error on Visual Studio 2013 --- src/collision/shapes/ConvexMeshShape.h | 4 ++-- src/engine/DynamicsWorld.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/collision/shapes/ConvexMeshShape.h b/src/collision/shapes/ConvexMeshShape.h index 072764b3..3f0b366e 100644 --- a/src/collision/shapes/ConvexMeshShape.h +++ b/src/collision/shapes/ConvexMeshShape.h @@ -224,12 +224,12 @@ inline void ConvexMeshShape::addEdge(uint v1, uint v2) { // If the entry for vertex v1 does not exist in the adjacency list if (mEdgesAdjacencyList.count(v1) == 0) { - mEdgesAdjacencyList.insert(std::make_pair >(v1, std::set())); + mEdgesAdjacencyList.insert(std::make_pair(v1, std::set())); } // If the entry for vertex v2 does not exist in the adjacency list if (mEdgesAdjacencyList.count(v2) == 0) { - mEdgesAdjacencyList.insert(std::make_pair >(v2, std::set())); + mEdgesAdjacencyList.insert(std::make_pair(v2, std::set())); } // Add the edge in the adjacency list diff --git a/src/engine/DynamicsWorld.cpp b/src/engine/DynamicsWorld.cpp index 8c4e2a34..f5637077 100644 --- a/src/engine/DynamicsWorld.cpp +++ b/src/engine/DynamicsWorld.cpp @@ -288,8 +288,7 @@ void DynamicsWorld::initVelocityArrays() { for (it = mRigidBodies.begin(); it != mRigidBodies.end(); ++it) { // Add the body into the map - mMapBodyToConstrainedVelocityIndex.insert(std::make_pair(*it, indexBody)); + mMapBodyToConstrainedVelocityIndex.insert(std::make_pair(*it, indexBody)); indexBody++; } }