Merge branch 'blender-v2.81-release'

This commit is contained in:
Campbell Barton 2019-10-22 15:26:23 +11:00
commit 2c6e95bb57
1 changed files with 9 additions and 1 deletions

View File

@ -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 *******************************/