mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'costashatz-develop-patch' into develop

Browse Source
This commit is contained in:
Daniel Chappuis 2018-01-26 17:48:42 +01:00
commit 9806094a3c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configuration.h
View File

@ -152,7 +152,7 @@ constexpr int NB_MAX_CONTACT_MANIFOLDS_CONCAVE_SHAPE = 3;
constexpr decimal COS_ANGLE_SIMILAR_CONTACT_MANIFOLD = decimal(0.95);
/// Size (in bytes) of the single frame allocator
constexpr size_t INIT_SINGLE_FRAME_ALLOCATOR_BYTES = 1048576; // 1Mb
constexpr std::size_t INIT_SINGLE_FRAME_ALLOCATOR_BYTES = 1048576; // 1Mb
}

2
src/engine/Profiler.h
View File

@ -415,7 +415,7 @@ inline void Profiler::destroy() {
#else // In profile is not active
// Empty macro in case profiling is not active
#define PROFILE(name)
#define PROFILE(name, profiler)
#endif