Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'Branch_2.86.1'

Browse Source
This commit is contained in:
nicolaichuk
2017-03-23 14:24:32 +03:00
parent 2c081c767c 6decb7ad1a
commit 8e1b146568
32 changed files with 1548 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LinearMath/btQuickprof.h
View File

@@ -65,9 +65,11 @@ btLeaveProfileZoneFunc* btGetCurrentLeaveProfileZoneFunc();
void btSetCustomEnterProfileZoneFunc(btEnterProfileZoneFunc* enterFunc);
void btSetCustomLeaveProfileZoneFunc(btLeaveProfileZoneFunc* leaveFunc);
#ifndef BT_NO_PROFILE // FIX redefinition
//To disable built-in profiling, please comment out next line
//#define BT_NO_PROFILE 1
#endif //BT_NO_PROFILE
#ifndef BT_NO_PROFILE
//btQuickprofGetCurrentThreadIndex will return -1 if thread index cannot be determined,
//otherwise returns thread index in range [0..maxThreads]