diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-08-20 16:41:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-20 16:42:04 +0300 |
| commit | e6a81ad61ed60384762ef4f28d62bbad65bc8814 (patch) | |
| tree | 33dec76c3c1c1226f740fd4eee7ac64b7e690683 /source/blender/blenlib | |
| parent | 8bee9af462238936087e0056d97cf086c2f7059a (diff) | |
Cleanup: comparison warning
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index ffdd03d3568..1452882fbba 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -297,7 +297,8 @@ void mul_m4_m4m4_db_uniq(double R[4][4], const double A[4][4], const double B[4] void mul_m4db_m4db_m4fl_uniq(double R[4][4], const double A[4][4], const float B[4][4]) { - BLI_assert(R != A && R != B); + /* Remove second check since types don't match. */ + BLI_assert(R != A /* && R != B */); /* matrix product: R[j][k] = A[j][i] . B[i][k] */ @@ -320,7 +321,6 @@ void mul_m4db_m4db_m4fl_uniq(double R[4][4], const double A[4][4], const float B R[3][1] = B[3][0] * A[0][1] + B[3][1] * A[1][1] + B[3][2] * A[2][1] + B[3][3] * A[3][1]; R[3][2] = B[3][0] * A[0][2] + B[3][1] * A[1][2] + B[3][2] * A[2][2] + B[3][3] * A[3][2]; R[3][3] = B[3][0] * A[0][3] + B[3][1] * A[1][3] + B[3][2] * A[2][3] + B[3][3] * A[3][3]; - } void mul_m4_m4_pre(float R[4][4], const float A[4][4]) |