diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-01-17 23:35:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-01-26 00:14:46 +0300 |
| commit | b64d5809e7e3b832e2a011869db68e70b4b4e6fc (patch) | |
| tree | aa4f6714da9f546eeee7dffed9236f9c8309524b /extern/bullet2/src/LinearMath/btMatrixX.h | |
| parent | 3c72e302e1eb25de43dd9d077f0c730cc02b5674 (diff) | |
Upgrade Bullet to version 2.83.
I tried to carefully preserve all patches since the last upgrade.
Improves T47195, cloth collision detection bug.
Differential Revision: https://developer.blender.org/D1739
Diffstat (limited to 'extern/bullet2/src/LinearMath/btMatrixX.h')
| -rw-r--r-- | extern/bullet2/src/LinearMath/btMatrixX.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extern/bullet2/src/LinearMath/btMatrixX.h b/extern/bullet2/src/LinearMath/btMatrixX.h index 865d77967a9..42caed42eff 100644 --- a/extern/bullet2/src/LinearMath/btMatrixX.h +++ b/extern/bullet2/src/LinearMath/btMatrixX.h @@ -19,6 +19,7 @@ subject to the following restrictions: #include "LinearMath/btQuickprof.h" #include "LinearMath/btAlignedObjectArray.h" +#include <stdio.h> //#define BT_DEBUG_OSTREAM #ifdef BT_DEBUG_OSTREAM @@ -94,7 +95,7 @@ struct btVectorX { T temp; temp = scale / absxi; - ssq = ssq * (temp * temp) + 1.0; + ssq = ssq * (temp * temp) + BT_ONE; scale = absxi; } else @@ -354,11 +355,11 @@ struct btMatrixX for (int i=0; i < res.rows(); ++i) { T dotProd=0; - T dotProd2=0; - int waste=0,waste2=0; +// T dotProd2=0; + //int waste=0,waste2=0; { - bool useOtherCol = true; +// bool useOtherCol = true; { for (int v=0;v<rows();v++) { |