diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-22 07:26:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-22 07:26:23 +0300 |
commit | 2c6e95bb57de8c6d5115f27846af99a086550889 (patch) | |
tree | 81cc2d1c9606a1bcafe48e5bf1b3c7824781c33e /source/blender/blenlib | |
parent | 502f01cc47aba7feec8da828692f60aa2774eb24 (diff) | |
parent | 6f779218fb6d04d5493cf8aff6884ebe18ffdc1e (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index 33e272ed7eb..48884082dd8 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -28,7 +28,9 @@ #include "BLI_strict_flags.h" -#include "eigen_capi.h" +#ifndef MATH_STANDALONE +# include "eigen_capi.h" +#endif /********************************* Init **************************************/ @@ -1152,9 +1154,11 @@ bool invert_m4(float m[4][4]) */ bool invert_m4_m4_fallback(float inverse[4][4], const float mat[4][4]) { +#ifndef MATH_STANDALONE if (EIG_invert_m4_m4(inverse, mat)) { return true; } +#endif int i, j, k; double temp; @@ -1222,9 +1226,13 @@ bool invert_m4_m4_fallback(float inverse[4][4], const float mat[4][4]) bool invert_m4_m4(float inverse[4][4], const float mat[4][4]) { +#ifndef MATH_STANDALONE /* Use optimized matrix inverse from Eigen, since performance * impact of this function is significant in complex rigs. */ return EIG_invert_m4_m4(inverse, mat); +#else + return invert_m4_m4_fallback(inverse, mat); +#endif } /****************************** Linear Algebra *******************************/ |